Merge pull request #2177 from apinf/develop

Merging for release 0.41.0

Author: brylie

.editorconfig

@@ -20,3 +20,9 @@ indent_size = 2
 charset = utf-8
 indent_style = space
 indent_size = 2
+
+# CSS styles
+[*.{css, less}]
+charset = utf-8
+indent_style = space
+indent_size = 2

.eslintignore

@@ -5,106 +5,4 @@ core/client/lib/chartsjs/*
 apis/client/profile/visibility/lib/bootstrap-switch.js
 /dashboard/client/charts/filtering/datepicker/
 /dashboard/client/charts/filtering/selectpicker/
-
-
-######################################################################
-##                       Temporarily ignored                        ##
-######################################################################
-## We want to lint all those files                                  ##
-## Please remove the line on this file if you are changing the file ##
-######################################################################
-documentation/client/codegenerator/autoform.js
-documentation/client/codegenerator/codegenerator.js
-documentation/client/codegenerator/codgeneratorSpecificLanguages.js
-documentation/client/design/documentation-editor.js
-documentation/client/lib/router.js
-documentation/client/manage/autoform.js
-documentation/client/manage/manage.js
-documentation/client/manage/uploadButton/uploadButton.js
-documentation/client/swaggerUI/swaggerUi.js
-documentation/client/view/documentation.js
-documentation/client/view/resumable.js
-documentation/collection/collection.js
-documentation/collection/server/permissions.js
-documentation/collection/server/publications.js
-documentation/server/methods/files.js
-documentation/server/methods/swagger.js
-documentation/server/publications.js
-elasticsearch/server/methods.js
-feedback_votes/collection/index.js
-feedback/client/form/autoform.js
-feedback/client/item/item.js
-feedback/client/list/list.js
-feedback/collection/index.js
-feedback/collection/schema.js
-feedback/collection/server/publications.js
-feedback/server/methods.js
-home/client/body/homeBody.js
-home/client/contact/autoform.js
-home/client/footer/homeFooter.js
-home/client/home.js
-home/client/lib/router.js
-metadata/client/edit/autoform.js
-metadata/collection/index.js
-metadata/collection/permissions.js
-metadata/collection/server/publication.js
-monitoring/client/autoform.js
-monitoring/client/monitoring.js
-monitoring/collection/index.js
-monitoring/collection/schema.js
-monitoring/collection/server/publications.js
-monitoring/server/cron.js
-proxies/api_umbrella/collections/api_umbrella_admins.js
-proxies/api_umbrella/collections/api_umbrella_users.js
-proxies/api_umbrella/collections/server/api_umbrella_admins_publications.js
-proxies/api_umbrella/collections/server/api_umbrella_users_publications.js
-proxies/client/form/autoform.js
-proxies/client/form/validation.js
-proxies/client/lib/router.js
-proxies/client/proxyItem/proxyItem.js
-proxies/collection/index.js
-proxies/collection/server/publications.js
-proxies/helper_functions/api_umbrella.js
-proxies/server/methods/api_umbrella.js
-proxy_backends/client/form/autoform.js
-proxy_backends/client/form/form.js
-proxy_backends/client/methods/convert_to_apiUmbrella_object.js
-proxy_backends/client/methods/delete_proxy_backend.js
-proxy_backends/client/modal_form/remove_selected_proxy/remove_selected_proxy.js
-proxy_backends/collection/apiUmbrellaSchema.js
-proxy_backends/collection/helpers.js
-proxy_backends/collection/index.js
-proxy_backends/collection/permissions.js
-proxy_backends/collection/regex.js
-proxy_backends/collection/schema.js
-proxy_backends/collection/server/publications.js
-proxy_backends/server/methods.js
-ratings/client/rating.js
-ratings/collection/index.js
-ratings/collection/permissions.js
-ratings/collection/schema.js
-ratings/collection/server/publications.js
-search/client/lib/router.js
-search/client/search.js
-search/server/publications.js
-settings/client/autoform.js
-settings/client/lib/router.js
-settings/collection/index.js
-settings/collection/permissions.js
-settings/collection/server/publications.js
-settings/server/methods.js
-setup/client/modal.js
-setup/server/methods.js
-status/client/lib/router.js
-status/client/status.js
-status/server/status.js
-users/client/account/account.js
-users/client/account/password/autoform.js
-users/client/lib/accounts_config.js
-users/collection/roles_schema.js
-users/collection/server/publications.js
-users/collection/users_permissions.js
-users/server/accounts_hooks.js
-users/server/login_verify.js
-users/server/methods.js
-users/server/startup_roles.js
+/api_media/lib/client/jquery.oembed.all.js

.eslintrc

@@ -1,4 +1,8 @@
 {
+  "env": {
+    "browser": true,
+    "jquery": true,
+  },
   "parser": "babel-eslint",
     "parserOptions": {
     "allowImportExportEverywhere": true,

.test/manageapibackend.js

@@ -37,6 +37,7 @@ test.describe('Manage API Backend', function() {
         var newDescription  = ' Date:' + new Date();
         driver.findElement(By.css('#apiBackendForm textarea[name="description"]')).sendKeys(newDescription);
         // Save settings
+
         driver.findElement(By.id('save-settings')).click()
             .then(function() {
                 driver.sleep(1000);

CONTRIBUTING.md

@@ -215,7 +215,7 @@ if (missingWidgets) {
  let missingWidgetsCount = missingWidgets.length
 
  // Alert the boss!
- console.log(missingWidgetsCount, "widgets are missing!");
+ 
 }
 ```
 
@@ -411,7 +411,7 @@ Migrations.add({
 });
 ```
 
-We are using *percolate:migrations* package for migrations. For additional info check 
+We are using *percolate:migrations* package for migrations. For additional info check
 [README](https://github.com/percolatestudio/meteor-migrations/edit/master/README.md).
 
 **References:**

README.md

@@ -45,7 +45,7 @@ For API consumers APInf provides simple key management, key usage analytics and
 ## Source code visualization
 Our project source code has changed throughout the project lifespan.
 
-[![source code structure](https://ia601503.us.archive.org/33/items/ApinfDevelopmentActivityUpTo0.33.1/Apinf-developmentActivity-upTo-0.33.1.gif)](https://archive.org/details/ApinfDevelopmentActivityUpTo0.33.1)
+[![source code structure](public/Apinf-developmentActivity-upTo-0.33.1.gif)](https://archive.org/details/ApinfDevelopmentActivityUpTo0.33.1)
 
 See the [high definition video (with music) of Apinf Development Activity up to version 0.33.1](https://archive.org/details/ApinfDevelopmentActivityUpTo0.33.1) on the Internet Archive.
 

about/client/about.html

@@ -28,7 +28,7 @@ <h3>
               Apinf
             </dt>
             <dd>
-              0.40.0
+              0.41.0
             </dd>
             <dt>
               API Umbrella

api_catalog/client/api_catalog.html

@@ -3,27 +3,25 @@
     <h1 class="page-header">
       {{_ "catalogue_Title" }}
     </h1>
-
     {{> apiCatalogToolbar apis=apis }}
 
-    <!-- if viewMode is table, show table -->
-    {{# if gridViewMode }}
-      {{# if Template.subscriptionsReady }}
+    {{# if Template.subscriptionsReady }}
+      <!-- if viewMode is grid, show grid -->
+      {{# if gridViewMode }}
         {{> apiCatalogGrid apis=apis }}
-      {{ else }}
-        {{> spinner }}
       {{/ if }}
-    {{/ if }}
-
-    <!-- if viewMode is table, show table -->
-    {{# if tableViewMode }}
-      {{# if Template.subscriptionsReady }}
+    
+      <!-- if viewMode is table, show table -->
+      {{# if tableViewMode }}
         {{> apiCatalogTable apis=apis }}
-      {{ else }}
-        {{> spinner }}
       {{/ if }}
+    
+      <!-- show pagination button only if APIs are available -->
+      {{# if apis }}
+        {{> defaultBootstrapPaginator pagination=templatePagination limit=10 containerClass="text-center" }}
+      {{/ if }}
+    {{ else }}
+      {{> spinner }}
     {{/ if }}
-
-    {{> defaultBootstrapPaginator pagination=templatePagination limit=10 containerClass="text-center" }}
   </div>
 </template>

api_catalog/client/api_catalog.js

@@ -4,7 +4,6 @@ import { Roles } from 'meteor/alanning:roles';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import Apis from '/apis/collection';
 import ApiBookmarks from '/bookmarks/collection';
-import $ from 'jquery';
 
 Template.apiCatalog.onCreated(function () {
   // Get reference to template instance

api_catalog/client/table/table.html

@@ -2,64 +2,64 @@
   <div class="table-responsive">
     <table class="table table-striped table-bordered api-catalogue-table">
       <tbody>
-        {{# each api in apis }}
+      {{# each api in apis }}
         {{# if api.currentUserCanView }}
-        <tr>
-          <td class="col-sm-1">
-            {{> viewApiStatus api=api width="0.6" }}
-            <div class="api-catalogue-table-logo center-block">
-              {{> viewApiLogo api=api }}
-            </div>
-          </td>
-          <td class="col-sm-9">
-            <h4 class="api-catalogue-table-title">
-              <a href="{{ pathFor 'viewApi' _id=api._id }}">
-                {{ api.name }}
-              </a>
-            </h4>
-            <!-- Api LifeCycleStatus Label -->
-            {{> apiLifecycleStatus api=api }}
+          <tr>
+            <td class="col-sm-1">
+              {{> viewApiStatus api=api width="0.6" }}
+              <div class="api-catalogue-table-logo center-block">
+                {{> viewApiLogo api=api }}
+              </div>
+            </td>
+            <td class="col-sm-9">
+              <h4 class="api-catalogue-table-title">
+                <a href="{{ pathFor 'viewApi' _id=api._id }}">
+                  {{ api.name }}
+                </a>
+              </h4>
+              <!-- Api LifeCycleStatus Label -->
+              {{> apiLifecycleStatus api=api }}
 
-            {{# unless api.isPublic }}
-              <span class="label label-default label-align">
+              {{# unless api.isPublic }}
+                <span class="label label-default">
                   {{_ "catalogueTable_labelText_private" }}
-              </span>
-            {{/ unless }}
-            <div>
-              <i>
-                {{_ "catalogueTable_addedBy" }}
-                {{ api.getApiManagersByName }}
-              </i>
-              <br>
-              <i>
-                {{_ "catalogueTable_added" }}
-                {{ api.relativeCreatedAt }}
-              </i>
-              {{# if api.description }}
-                <p class="api-catalogue-table-description">
-                  {{ api.description }}
-                </p>
+                </span>
+              {{/ unless }}
+              <div>
+                <i>
+                  {{_ "catalogueTable_addedBy" }}
+                  {{ api.getApiManagersByName }}
+                </i>
+                <br>
+                <i>
+                  {{_ "catalogueTable_added" }}
+                  {{ api.relativeCreatedAt }}
+                </i>
+                {{# if api.description }}
+                  <p class="api-catalogue-table-description">
+                    {{ api.description }}
+                  </p>
+                {{/ if }}
+              </div>
+            </td>
+            <td class="col-sm-1" style="vertical-align:middle">
+              {{> apiBackendRating api }}
+            </td>
+            <td class="col-sm-1 text-center">
+              {{# if currentUser }}
+                <span class="api-card-bookmark">
+                  {{> bookmark api=api catalogueView=true }}
+                </span>
+              {{ else }}
+                <span class="api-card-bookmark">
+                  <i class="fa fa-bookmark bookmark-default"></i>
+                  {{ api.bookmarkCount }}
+                </span>
               {{/ if }}
-            </div>
-          </td>
-          <td class="col-sm-1" style="vertical-align:middle">
-            {{> apiBackendRating api }}
-          </td>
-          <td class="col-sm-1 text-center">
-            {{# if currentUser }}
-            <span class="api-card-bookmark">
-              {{> bookmark api=api catalogueView=true }}
-            </span>
-            {{ else }}
-            <span class="api-card-bookmark">
-              <i class="fa fa-bookmark bookmark-default"></i>
-              {{ api.bookmarkCount }}
-            </span>
-            {{ /if }}
-          </td>
-        </tr>
+            </td>
+          </tr>
         {{/ if }}
-        {{/ each }}
+      {{/ each }}
       </tbody>
     </table>
   </div>