Update slug

- closes #2805
apinf · Sep 27, 2017 · e9c3b2b · e9c3b2b
1 parent cb136c8
commit e9c3b2b
Show file tree

Hide file tree

Showing 106 changed files with 977 additions and 2,025 deletions.
diff --git a/.meteor/packages b/.meteor/packages
@@ -12,7 +12,6 @@ aldeed:autoform
 aldeed:collection2
 aldeed:simple-schema
 aldeed:template-extension
-apinf:accounts-admin-ui@0.3.1
 apinf:api-umbrella
 apinf:autoform-bs-datepicker
 apinf:restivus-swagger
@@ -90,8 +89,7 @@ aramk:quill
 softwarerero:accounts-t9n
 aldeed:autoform-bs-button-group-input
 raix:rssfeed
+apinf:accounts-admin-ui
 http@1.2.12
 reactive-dict@1.1.9
 dynamic-import
-apinf:accounts-fiware@0.1.1
-apinf:fiware@0.1.1
diff --git a/.meteor/versions b/.meteor/versions
@@ -13,15 +13,13 @@ aldeed:schema-deny@1.1.0
 aldeed:schema-index@1.1.1
 aldeed:simple-schema@1.5.3
 aldeed:template-extension@4.1.0
-allow-deny@1.0.9
+allow-deny@1.0.6
 amplify@1.0.0
 apinf:accounts-admin-ui@0.3.2
-apinf:accounts-fiware@0.1.1
 apinf:api-umbrella@1.4.1
 apinf:autoform-bs-datepicker@1.1.2
 apinf:create-role-if-undefined@0.1.1
 apinf:first-admin@0.1.2
-apinf:fiware@0.1.1
 apinf:restivus-swagger@0.4.0
 aramk:quill@0.1.1
 arillo:flow-router-helpers@0.5.2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -73,7 +73,7 @@
 - Try to simplify the username regular expression, if possible [\#1985](https://github.com/apinf/platform/issues/1985)
 - Renew Let's encrypt certificate not working [\#1971](https://github.com/apinf/platform/issues/1971)
 - Study options for DDoS attack prevention [\#1953](https://github.com/apinf/platform/issues/1953)
-- catalog sorting doesn't follow i18n recommendations [\#1303](https://github.com/apinf/platform/issues/1303)
+- Catalogue sorting doesn't follow i18n recommendations [\#1303](https://github.com/apinf/platform/issues/1303)
 - Organize APIs according to organization in Catalog [\#1012](https://github.com/apinf/platform/issues/1012)
 - Invalid Contact data accepted [\#855](https://github.com/apinf/platform/issues/855)
 
@@ -96,7 +96,7 @@
 - Added escaping characters $.?\*+\(\) in proxyBasePathRegEx and apiBasePathRegEx [\#2256](https://github.com/apinf/platform/pull/2256) ([matleppa](https://github.com/matleppa))
 - Normalize apimetadata [\#2254](https://github.com/apinf/platform/pull/2254) ([marla-singer](https://github.com/marla-singer))
 - Added dot as allowed char in apiBasePathRegEx [\#2247](https://github.com/apinf/platform/pull/2247) ([matleppa](https://github.com/matleppa))
-- Api catalog sort with i18n support [\#2243](https://github.com/apinf/platform/pull/2243) ([manzapanza](https://github.com/manzapanza))
+- Api Catalogue sort with i18n support [\#2243](https://github.com/apinf/platform/pull/2243) ([manzapanza](https://github.com/manzapanza))
 - Change in API name with proxy setting displays correct Api Name … [\#2240](https://github.com/apinf/platform/pull/2240) ([snittoor](https://github.com/snittoor))
 - Add copyright & license [\#2227](https://github.com/apinf/platform/pull/2227) ([marla-singer](https://github.com/marla-singer))
 - Bugfix/dashboard link in footer [\#2226](https://github.com/apinf/platform/pull/2226) ([marla-singer](https://github.com/marla-singer))
@@ -491,7 +491,7 @@
 - User unable to Register [\#1726](https://github.com/apinf/platform/issues/1726)
 - 'Email Reset password link' not working [\#1692](https://github.com/apinf/platform/issues/1692)
 - No response while edit and submit 'Proxy' form [\#1689](https://github.com/apinf/platform/issues/1689)
-- Tableview of catalog throws error in console [\#1642](https://github.com/apinf/platform/issues/1642)
+- Tableview of catalogue throws error in console [\#1642](https://github.com/apinf/platform/issues/1642)
 - Upload Swagger document shows error [\#1588](https://github.com/apinf/platform/issues/1588)
 - User not notified if details missing/invalid while saving the proxy settings [\#1562](https://github.com/apinf/platform/issues/1562)
 - Sort by 'Average Rating' available in 'Catalog' view while 'Star rating feature has been removed [\#1442](https://github.com/apinf/platform/issues/1442)
@@ -1055,7 +1055,7 @@
 - Wireframe for showing context awareness [\#1284](https://github.com/apinf/platform/issues/1284)
 - Add missing i18n tokens/texts related to Edit API Metadata form [\#1273](https://github.com/apinf/platform/issues/1273)
 - Add missing i18n tokens/texts related to View API Backend [\#1272](https://github.com/apinf/platform/issues/1272)
-- Add missing i18n tokens/texts to catalog view [\#1270](https://github.com/apinf/platform/issues/1270)
+- Add missing i18n tokens/texts to Catalogue view [\#1270](https://github.com/apinf/platform/issues/1270)
 - Add missing i18n tokens/texts to Add API Backend Wizard [\#1269](https://github.com/apinf/platform/issues/1269)
 - Add missing landing page i18n tokens/texts [\#1267](https://github.com/apinf/platform/issues/1267)
 - Alphabetize existing i18n strings by key in en.i18n.js [\#1264](https://github.com/apinf/platform/issues/1264)
@@ -1064,7 +1064,7 @@
 - API backend view in not working [\#1258](https://github.com/apinf/platform/issues/1258)
 - Redsigning Topbar and Sidemenu [\#1239](https://github.com/apinf/platform/issues/1239)
 - Edit 'My bookmarks' in catalog view displays mouse pointer text for all other bookmarked APIs [\#1237](https://github.com/apinf/platform/issues/1237)
-- Add i18n tokens to catalog sort bar options [\#1232](https://github.com/apinf/platform/issues/1232)
+- Add i18n tokens to catalogue sort bar options [\#1232](https://github.com/apinf/platform/issues/1232)
 - Change api-umbrella sync frequency [\#1230](https://github.com/apinf/platform/issues/1230)
 - Docker production setup [\#1227](https://github.com/apinf/platform/issues/1227)
 - Create instructions on deployment [\#1222](https://github.com/apinf/platform/issues/1222)
@@ -1116,8 +1116,8 @@
 - Feature/updated dashboard [\#1245](https://github.com/apinf/platform/pull/1245) ([frenchbread](https://github.com/frenchbread))
 - Hotfix/api umbrella sync frequency [\#1229](https://github.com/apinf/platform/pull/1229) ([frenchbread](https://github.com/frenchbread))
 - Add docker-compose.yml for production [\#1223](https://github.com/apinf/platform/pull/1223) ([shaliko](https://github.com/shaliko))
-- Feature/catalog toggle sort filter bar [\#1221](https://github.com/apinf/platform/pull/1221) ([brylie](https://github.com/brylie))
-- catalog not displayed on nightly [\#1217](https://github.com/apinf/platform/pull/1217) ([jykae](https://github.com/jykae))
+- Feature/catalogue toggle sort filter bar [\#1221](https://github.com/apinf/platform/pull/1221) ([brylie](https://github.com/brylie))
+- Catalogue not displayed on nightly [\#1217](https://github.com/apinf/platform/pull/1217) ([jykae](https://github.com/jykae))
 - Bugfix/apidocs notdefined when deleting [\#1205](https://github.com/apinf/platform/pull/1205) ([jykae](https://github.com/jykae))
 - Bugfix/manager ids disappearing service restart [\#1202](https://github.com/apinf/platform/pull/1202) ([jykae](https://github.com/jykae))
 - Feature/meteor update [\#1162](https://github.com/apinf/platform/pull/1162) ([brylie](https://github.com/brylie))
@@ -1134,7 +1134,7 @@
 **Fixed bugs:**
 
 - 'Description' text not saved while adding API backend [\#1188](https://github.com/apinf/platform/issues/1188)
-- Username undefined in catalog view [\#1187](https://github.com/apinf/platform/issues/1187)
+- Username undefined in catalogue view [\#1187](https://github.com/apinf/platform/issues/1187)
 - 'View usage instructions' button not responding in API backend view [\#1157](https://github.com/apinf/platform/issues/1157)
 - Server error \(500\) when uploading swagger documentation [\#1152](https://github.com/apinf/platform/issues/1152)
 - Documentation link on API Backend documentation tab not working [\#1133](https://github.com/apinf/platform/issues/1133)
@@ -1158,7 +1158,7 @@
 - User Interview for Analytics [\#1181](https://github.com/apinf/platform/issues/1181)
 - HiFi prototypes for Dashboard [\#1168](https://github.com/apinf/platform/issues/1168)
 - Review and/or delete stale branches [\#1154](https://github.com/apinf/platform/issues/1154)
-- Temporarily restore catalog table [\#1147](https://github.com/apinf/platform/issues/1147)
+- Temporarily restore catalogue table [\#1147](https://github.com/apinf/platform/issues/1147)
 - Toggle Menu HiFi wireframe [\#1143](https://github.com/apinf/platform/issues/1143)
 - HiFi Wireframes for APInf landing page [\#1142](https://github.com/apinf/platform/issues/1142)
 - Add a Cancel button and close buttonin API Documentation Manage dialogue [\#1136](https://github.com/apinf/platform/issues/1136)
@@ -1191,21 +1191,21 @@
 **Merged pull requests:**
 
 - Hotfix/add api description field [\#1198](https://github.com/apinf/platform/pull/1198) ([nnn](https://github.com/nnn))
-- Bugfix/username undefined catalog [\#1197](https://github.com/apinf/platform/pull/1197) ([jykae](https://github.com/jykae))
+- Bugfix/username undefined catalogue [\#1197](https://github.com/apinf/platform/pull/1197) ([jykae](https://github.com/jykae))
 - Feature/upload documentation modal improvements [\#1194](https://github.com/apinf/platform/pull/1194) ([nnn](https://github.com/nnn))
 - Cleanup/GitHub onlogin hook [\#1186](https://github.com/apinf/platform/pull/1186) ([jykae](https://github.com/jykae))
 - Bugfix/documentation editor host undefined [\#1185](https://github.com/apinf/platform/pull/1185) ([jykae](https://github.com/jykae))
 - Feature/add api logo [\#1173](https://github.com/apinf/platform/pull/1173) ([nnn](https://github.com/nnn))
-- Feature/catalog toggle sort filter bar [\#1165](https://github.com/apinf/platform/pull/1165) ([brylie](https://github.com/brylie))
+- Feature/catalogue toggle sort filter bar [\#1165](https://github.com/apinf/platform/pull/1165) ([brylie](https://github.com/brylie))
 - Hotfix/delay and error swagger upload [\#1155](https://github.com/apinf/platform/pull/1155) ([nnn](https://github.com/nnn))
 - fixes 'fields is not defined' [\#1153](https://github.com/apinf/platform/pull/1153) ([nnn](https://github.com/nnn))
-- Restore catalog table view [\#1148](https://github.com/apinf/platform/pull/1148) ([brylie](https://github.com/brylie))
+- Restore catalogue table view [\#1148](https://github.com/apinf/platform/pull/1148) ([brylie](https://github.com/brylie))
 - Move API Status Indicator to right of header text [\#1140](https://github.com/apinf/platform/pull/1140) ([brylie](https://github.com/brylie))
 - Add documentation link to href [\#1139](https://github.com/apinf/platform/pull/1139) ([brylie](https://github.com/brylie))
 - Add API usage instructions template include [\#1138](https://github.com/apinf/platform/pull/1138) ([brylie](https://github.com/brylie))
 - Feature/api rating bookmark data model [\#1131](https://github.com/apinf/platform/pull/1131) ([brylie](https://github.com/brylie))
 - Feature/mandatory fields for setup wizard [\#1124](https://github.com/apinf/platform/pull/1124) ([nnn](https://github.com/nnn))
-- Feature/catalog container [\#1122](https://github.com/apinf/platform/pull/1122) ([brylie](https://github.com/brylie))
+- Feature/catalogue container [\#1122](https://github.com/apinf/platform/pull/1122) ([brylie](https://github.com/brylie))
 - Additional error handling [\#1119](https://github.com/apinf/platform/pull/1119) ([frenchbread](https://github.com/frenchbread))
 - admin can upload/remove documentation file [\#1113](https://github.com/apinf/platform/pull/1113) ([nnn](https://github.com/nnn))
 - Update API Umbrella Web instance with new settings [\#1106](https://github.com/apinf/platform/pull/1106) ([brylie](https://github.com/brylie))
@@ -1216,7 +1216,7 @@
 - Replace Meteor.settings with settings mongoldb document [\#1082](https://github.com/apinf/platform/pull/1082) ([frenchbread](https://github.com/frenchbread))
 - Remove console.logs, print error on catch [\#1078](https://github.com/apinf/platform/pull/1078) ([jykae](https://github.com/jykae))
 - Remove custom validation, toggle mail fields [\#1076](https://github.com/apinf/platform/pull/1076) ([jykae](https://github.com/jykae))
-- New look of API catalog [\#1060](https://github.com/apinf/platform/pull/1060) ([nnn](https://github.com/nnn))
+- New look of API catalogue [\#1060](https://github.com/apinf/platform/pull/1060) ([nnn](https://github.com/nnn))
 
 ## [0.2.24](https://github.com/apinf/platform/tree/0.2.24) (2016-06-07)
 [Full Changelog](https://github.com/apinf/platform/compare/0.2...0.2.24)
@@ -1301,7 +1301,7 @@
 
 - Move /docs to documentation repository [\#1063](https://github.com/apinf/platform/issues/1063)
 - Install Swagger Codegen [\#1047](https://github.com/apinf/platform/issues/1047)
-- Listing of API catalogs [\#1031](https://github.com/apinf/platform/issues/1031)
+- Listing of API catalogues [\#1031](https://github.com/apinf/platform/issues/1031)
 - Selection of API categories [\#1026](https://github.com/apinf/platform/issues/1026)
 - Deploy master to apinf.io [\#1015](https://github.com/apinf/platform/issues/1015)
 - Load updated Swagger document to Documentation viewer [\#1006](https://github.com/apinf/platform/issues/1006)
@@ -1521,7 +1521,7 @@
 
 **Closed issues:**
 
-- Make catalog view publicly accessible [\#686](https://github.com/apinf/platform/issues/686)
+- Make catalogue view publicly accessible [\#686](https://github.com/apinf/platform/issues/686)
 - Deploy the 0.2.0 alpha 2 release [\#670](https://github.com/apinf/platform/issues/670)
 - Functional testing: Test analytics dashboard [\#647](https://github.com/apinf/platform/issues/647)
 - Presentation material for Apika info session [\#597](https://github.com/apinf/platform/issues/597)
@@ -1534,7 +1534,7 @@
 - Feature/701 no anonymous ratings. Closes \#701 [\#705](https://github.com/apinf/platform/pull/705) ([brylie](https://github.com/brylie))
 - Feature/702 autopublish new apis on api umbrella. Closes \#702 [\#704](https://github.com/apinf/platform/pull/704) ([brylie](https://github.com/brylie))
 - Feature/641 api feedback voting. Closes \#641 [\#703](https://github.com/apinf/platform/pull/703) ([jykae](https://github.com/jykae))
-- Feature/686 catalog publicly accessible [\#700](https://github.com/apinf/platform/pull/700) ([nnn](https://github.com/nnn))
+- Feature/686 catalogue publicly accessible [\#700](https://github.com/apinf/platform/pull/700) ([nnn](https://github.com/nnn))
 - Remove \[Frontend prefix\] sample path - closes \#679 [\#699](https://github.com/apinf/platform/pull/699) ([frenchbread](https://github.com/frenchbread))
 - Feature/documentation basePath prefix fix - closes \#694 [\#698](https://github.com/apinf/platform/pull/698) ([frenchbread](https://github.com/frenchbread))
 - Revert "Fix for Issue/654" [\#695](https://github.com/apinf/platform/pull/695) ([bajiat](https://github.com/bajiat))
@@ -1849,7 +1849,7 @@
 
 **Fixed bugs:**
 
-- Fix API catalog table columns [\#372](https://github.com/apinf/platform/issues/372)
+- Fix API catalogue table columns [\#372](https://github.com/apinf/platform/issues/372)
 - Exception "Sync API Umbrella Users and API Backends" Error: Server is required [\#346](https://github.com/apinf/platform/issues/346)
 - Refresh heatmap when data is returned from ElasticSearch [\#322](https://github.com/apinf/platform/issues/322)
 
@@ -2037,7 +2037,7 @@
 - Feature/apibackends form [\#230](https://github.com/apinf/platform/pull/230) ([nnn](https://github.com/nnn))
 - temporarily back to px [\#229](https://github.com/apinf/platform/pull/229) ([nnn](https://github.com/nnn))
 - added 'roles' of schema to omitFields [\#228](https://github.com/apinf/platform/pull/228) ([nnn](https://github.com/nnn))
-- Feature/api catalog functionality [\#227](https://github.com/apinf/platform/pull/227) ([JuusoV](https://github.com/JuusoV))
+- Feature/api catalogue functionality [\#227](https://github.com/apinf/platform/pull/227) ([JuusoV](https://github.com/JuusoV))
 - Feature/mail [\#226](https://github.com/apinf/platform/pull/226) ([JuusoV](https://github.com/JuusoV))
 - Updating user stories [\#210](https://github.com/apinf/platform/pull/210) ([bajiat](https://github.com/bajiat))
 - Adding UX and developer documentation to development branch [\#209](https://github.com/apinf/platform/pull/209) ([bajiat](https://github.com/bajiat))
@@ -2111,7 +2111,7 @@
 - Create a form for API definition based on API Umbrella UI [\#73](https://github.com/apinf/platform/issues/73)
 - Add API key field to user profile [\#69](https://github.com/apinf/platform/issues/69)
 - Create a new API Umbrella user on Apinf sign-up [\#68](https://github.com/apinf/platform/issues/68)
-- Create a catalog view for APIs [\#67](https://github.com/apinf/platform/issues/67)
+- Create a catalogue view for APIs [\#67](https://github.com/apinf/platform/issues/67)
 - Determine how to add color schemas for Boilerplate UI [\#66](https://github.com/apinf/platform/issues/66)
 - Create basic API Umbrella Admin API wrapper package for Meteor [\#65](https://github.com/apinf/platform/issues/65)
 - Create ecosystem/architecture diagram [\#59](https://github.com/apinf/platform/issues/59)

diff --git a/apinf_packages/api_catalog/client/api_catalog.html b/apinf_packages/api_catalog/client/api_catalog.html
@@ -6,7 +6,7 @@
 <template name="apiCatalog">
   <div class="container">
     <h1 class="page-header">
-      {{_ "catalog_Title" }}
+      {{_ "catalogue_Title" }}
       {{# if apisCount }}
       <small>
         {{_ 'apiCatalog_apisCount' count=apisCount }}

diff --git a/apinf_packages/api_catalog/client/api_catalog.js b/apinf_packages/api_catalog/client/api_catalog.js
@@ -68,24 +68,13 @@ Template.apiCatalog.onCreated(function () {
 
   // Watch for changes in the sort settings
   instance.autorun(() => {
-    let sortByParameter = FlowRouter.getQueryParam('sortBy');
+    // Check URL parameter for sorting
+    const sortByParameter = FlowRouter.getQueryParam('sortBy');
 
     // Check URL parameter for sort direction and convert to integer
-    let sortDirectionParameter = -1;
+    const sortDirectionParameter =
+      FlowRouter.getQueryParam('sortDirection') === 'ascending' ? 1 : -1;
 
-    // Check URL parameter for sorting
-    switch (sortByParameter) {
-      case 'name-asc':
-        sortByParameter = 'name';
-        sortDirectionParameter = 1;
-        break;
-      case 'name-desc':
-        sortByParameter = 'name';
-        sortDirectionParameter = -1;
-        break;
-      default:
-        break;
-    }
     // Create a object for storage sorting parameters
     let sort = {};
     // Check of existing parameters

diff --git a/apinf_packages/api_catalog/client/api_catalog.less b/apinf_packages/api_catalog/client/api_catalog.less
@@ -33,8 +33,3 @@ https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence
 .col-grid{
   margin-bottom: 1.87em;
 }
-
-.navbar-right > a.rss-feed {
-  font-size: 38px;
-  padding: 0px;
-}
diff --git a/apinf_packages/api_catalog/client/grid/grid.html b/apinf_packages/api_catalog/client/grid/grid.html
@@ -5,20 +5,16 @@
 
 <template name="apiCatalogGrid">
   <div class="row">
-    {{# if Template.subscriptionsReady }}
-      {{# if apis.length }}
-        {{# each api in apis }}
-          <div class="col-grid col-xl-2 col-lg-3 col-md-4 col-sm-6 col-xs-12">
-            {{> apiCard api=api organization=organization }}
-          </div>
-        {{/ each }}
-      {{ else }}
-        <div class="col-xs-12">
-          <p>
-            {{_ 'apiCatalog_noApis_Found' }}
-          </p>
+    {{#if apis.length}}
+      {{# each api in apis }}
+        <div class="col-grid col-xl-2 col-lg-3 col-md-4 col-sm-6 col-xs-12">
+          {{> apiCard api=api organization=organization }}
         </div>
-      {{/ if }}
-    {{/ if }}
+      {{/ each }}
+    {{else}}
+      <div class="col-xs-12">
+        <p>{{_ 'apiCatalog_noApis_Found'}}</p>
+      </div>
+    {{/if}}
   </div>
 </template>
diff --git a/apinf_packages/api_catalog/client/lib/router.js b/apinf_packages/api_catalog/client/lib/router.js
@@ -14,7 +14,10 @@ FlowRouter.route('/apis', {
   // Get query parameters for Catalog page on Enter
   triggersEnter: [function (context) {
     if (!context.queryParams.sortBy) {
-      context.queryParams.sortBy = 'name-asc';
+      context.queryParams.sortBy = 'name';
+    }
+    if (!context.queryParams.sortDirection) {
+      context.queryParams.sortDirection = 'ascending';
     }
     if (!context.queryParams.viewMode) {
       context.queryParams.viewMode = 'grid';