Merge pull request #3194 from apinf/develop

0.52.0 release

Author: matleppa

.eslintrc

@@ -44,7 +44,7 @@
     "no-underscore-dangle": [
       2,
       {
-        "allow": ["_id", "__", "_initialized", "_config", "_debug"]
+        "allow": ["_id", "__", "_initialized", "_config", "_debug", "_schema"]
       }
     ],
     "no-negated-condition": [

issue_template.md .github/issue_template.mdissue_template.md renamed to .github/issue_template.md

@@ -7,8 +7,8 @@
 .vscode/
 config.json
 docker/api-umbrella/config/api-umbrella.yml
-docker/apinf/env
-docker/ssl/env
+docker/env.apinf
+docker/env.ssl
 mup.json
 node_modules/
 npm-debug.log*

.gitignore

@@ -53,8 +53,6 @@ matb33:collection-hooks
 [email protected]
 meteorhacks:subs-manager
 michalvalasek:autoform-bootstrap-colorpicker
-mizzao:sharejs-ace
-mizzao:sharejs@=0.9.0
 [email protected]
 [email protected]
 nimble:restivus@=0.8.11
@@ -95,3 +93,5 @@ useraccounts:core
 useraccounts:flow-routing
 vsivsi:file-collection
 zimme:active-route
+aldeed:autoform-select2
+natestrauser:select2

.meteor/packages

@@ -2,13 +2,14 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected]
 [email protected]
+[email protected]
 alanning:[email protected]
-aldeed:[email protected]
 aldeed:[email protected]
-aldeed:[email protected]
+aldeed:[email protected]
+aldeed:[email protected]
 aldeed:[email protected]
+aldeed:[email protected]
 aldeed:[email protected]
 aldeed:[email protected]
 aldeed:[email protected]
@@ -31,9 +32,9 @@ [email protected]
 [email protected]
 benmgreene:[email protected]
 [email protected]
+[email protected]
 [email protected]
 [email protected]
-[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -43,23 +44,23 @@ cfs:[email protected]
 cfs:[email protected]
 cfs:[email protected]
 [email protected]
-[email protected]_1
 [email protected]_1
+[email protected]_1
 dandv:[email protected]_2
 dburles:[email protected]
+[email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected]
 deepwell:[email protected]
 [email protected]
 [email protected]
 [email protected]
+[email protected]
+[email protected]
 [email protected]
 [email protected]
-[email protected]
-[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -78,13 +79,13 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-juliancwirko:[email protected]
 juliancwirko:[email protected]
+juliancwirko:[email protected]
 kadira:[email protected]
 kadira:[email protected]
 kadira:[email protected]
-kurounin:[email protected]
 kurounin:[email protected]
+kurounin:[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -93,30 +94,29 @@ [email protected]
 [email protected]
 matb33:[email protected]
 mdg:[email protected]
-[email protected]
 [email protected]
+[email protected]
 meteorhacks:[email protected]
 meteorspark:[email protected]
 michalvalasek:[email protected]
 [email protected]
 [email protected]
 [email protected]
-mizzao:[email protected]
-mizzao:[email protected]
 [email protected]
 [email protected]
-[email protected]
 [email protected]
+[email protected]
 momentjs:[email protected]
+[email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected]
+natestrauser:[email protected]
 nimble:[email protected]
 [email protected]
 [email protected]
-[email protected]
 [email protected]
+[email protected]
 [email protected]
 olragon:[email protected]
 [email protected]
@@ -148,18 +148,18 @@ [email protected]
 simple:[email protected]
 simple:[email protected]
 softwarerero:[email protected]
-[email protected]
 [email protected]
+[email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-tap:[email protected]
 tap:[email protected]
+tap:[email protected]
+[email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected]
 tmeasday:[email protected]
 todda00:[email protected]
 [email protected]
@@ -173,6 +173,6 @@ useraccounts:[email protected]
 useraccounts:[email protected]
 useraccounts:[email protected]
 vsivsi:[email protected]
-[email protected]
 [email protected]
+[email protected]
 zimme:[email protected]

.meteor/versions

@@ -54,8 +54,8 @@ Register a new admin account. The first user will become Admin.
 ## With Docker Compose
 1. Create "docker-compose.yml" file on your server and copy content from [docker-compose.yml](https://github.com/apinf/platform/blob/develop/docker-compose.yml).
 2. In the same folder create file "docker/api-umbrella/config/api-umbrella.yml" based on example "docker/api-umbrella/config/api-umbrella.yml.example". ATTENTION: replace "example.com" on YOUR_SITE_DOMAIN for keys "ssl_cert" and "ssl_cert_key".
-3. Create file "docker/apinf/env" based on example "docker/apinf/env.example".
-4. Create file "docker/ssl/env" based on example "docker/ssl/env.example".
+3. Create file "docker/env.apinf" based on example "docker/env.apinf.example".
+4. Create file "docker/env.ssl" based on example "docker/env.ssl.example".
 5. Run ```docker-compose up -d```. The first launch of will be slow because (take couple of minutes) of the DH parameter computation and configure Let's Encrypt certificate.
 6. Visit https://YOUR_SITE_DOMAIN:3002/signup/ and fill form for get API Key.
 7. Visit https://YOUR_SITE_DOMAIN:3002/admin/ and click on 'My Account' link for find Admin API Token.

INSTALL.md

@@ -54,6 +54,6 @@ See the [high definition video (with music) of Apinf Development Activity up to
 You can preview our latest version at [nightly.apinf.io](http://nightly.apinf.io). Feel free to register an account and test things out.
 
 # Contributing
-Please review our [Contributor Guide](https://github.com/apinf/platform/blob/develop/CONTRIBUTING.md) for details on how to get involved with the project.
+Please review our [Contributor Guide](https://github.com/apinf/platform/blob/develop/.github/CONTRIBUTING.md) for details on how to get involved with the project.
 
 Please follow guidelines for community involvement in our [Code of Conduct](https://github.com/apinf/platform/blob/develop/CODE_OF_CONDUCT.md)

README.md

@@ -33,7 +33,7 @@ <h3>
               Apinf
             </dt>
             <dd>
-              0.51.0
+              0.52.0
             </dd>
             <dt>
               API Umbrella

apinf_packages/about/client/about.html

@@ -5,23 +5,39 @@ https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence
 
 // Meteor packages imports
 import { Meteor } from 'meteor/meteor';
-import { TAPi18n } from 'meteor/tap:i18n';
 import { Template } from 'meteor/templating';
 
 // Meteor contributed packages imports
+import { DocHead } from 'meteor/kadira:dochead';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Roles } from 'meteor/alanning:roles';
+import { TAPi18n } from 'meteor/tap:i18n';
 
 // Collection imports
 import Apis from '/apinf_packages/apis/collection';
 import ApiBookmarks from '/apinf_packages/bookmarks/collection';
+import ApiDocs from '/apinf_packages/api_docs/collection';
+import Branding from '/apinf_packages/branding/collection';
 
 import 'locale-compare-polyfill';
 
+// Npm packages imports
+import _ from 'lodash';
+
 Template.apiCatalog.onCreated(function () {
   // Get reference to template instance
   const instance = this;
 
+  instance.autorun(() => {
+    // Get Branding collection content
+    const branding = Branding.findOne();
+    // Check if Branding collection and siteTitle are available
+    if (branding && branding.siteTitle) {
+      // Set the page title
+      const pageTitle = TAPi18n.__('apiCatalogPage_title_apiCatalog');
+      DocHead.setTitle(`${branding.siteTitle} - ${pageTitle}`);
+    }
+  });
   // Get user id
   const userId = Meteor.userId();
 
@@ -57,6 +73,9 @@ Template.apiCatalog.onCreated(function () {
     filters,
   });
 
+  // Subscribe to apiDocs that contains either 'fileId' or 'remoteFileUrl'
+  instance.subscribe('apisDocuments');
+
   // Subscribe to bookmarks of current user
   instance.subscribe('userApiBookmarks');
 
@@ -156,6 +175,28 @@ Template.apiCatalog.onCreated(function () {
       delete currentFilters.lifecycleStatus;
     }
 
+    // Check URL parameter for apisWithDocumentation filter
+    const apisWithDocumentation = FlowRouter.getQueryParam('apisWithDocumentation');
+
+    // Checking if 'APIs with Documentation' filter is checked or not
+    if (apisWithDocumentation === 'true') {
+      // Fetching published ApiDocs
+      const apiDocs = ApiDocs.find().fetch();
+      // Creating array of ApiIds
+      let apiIds = _.map(apiDocs, 'apiId');
+
+      // checking if 'My Bookmarks' filter is checked or not
+      if (filterByParameter === 'my-bookmarks') {
+        // fetch bookmarked ApiIds
+        const bookmarkedApiIds = currentFilters._id.$in;
+        // find ApiIds that are bookmarked and that contains Api Documentation
+        apiIds = _.intersection(bookmarkedApiIds, apiIds);
+      }
+
+      // Set filter for filtering out apiIds that dont contain Api Documentation
+      currentFilters._id = { $in: apiIds };
+    }
+
     instance.pagination.filters(currentFilters);
   });
 });

apinf_packages/api_catalog/client/api_catalog.js

@@ -50,25 +50,32 @@
             </div>
           </form>
         </div>
-        
+
         {{# if currentUser }}
-        <div class="nav navbar-nav">
-          <div class="btn-group navbar-btn filter-options-menu" role="group" aria-label="Filter options" data-toggle="buttons">
-            <label class="btn btn-default active" id="filterBy-all">
-              <input type="radio" name="filter-options" value="all" checked>
-              {{_ "catalog_toolbar_filterOptions_showAll" }}
-            </label>
-            <label class="btn btn-default" id="filterBy-my-apis">
-              <input type="radio" name="filter-options" value="my-apis">
-              {{_ "catalog_toolbar_filterOptions_myApis" }}
-            </label>
-            <label class="btn btn-default" id="filterBy-my-bookmarks">
-              <input type="radio" name="filter-options" value="my-bookmarks">
-              {{_ "catalog_toolbar_filterOptions_myBookmarks" }}
-            </label>
+          <div class="nav navbar-nav">
+            <div class="btn-group navbar-btn filter-options-menu" role="group" aria-label="Filter options" data-toggle="buttons">
+              <label class="btn btn-default active" id="filterBy-all">
+                <input type="radio" name="filter-options" value="all" checked>
+                {{_ "catalog_toolbar_filterOptions_showAll" }}
+              </label>
+              <label class="btn btn-default" id="filterBy-my-apis">
+                <input type="radio" name="filter-options" value="my-apis">
+                {{_ "catalog_toolbar_filterOptions_myApis" }}
+              </label>
+              <label class="btn btn-default" id="filterBy-my-bookmarks">
+                <input type="radio" name="filter-options" value="my-bookmarks">
+                {{_ "catalog_toolbar_filterOptions_myBookmarks" }}
+              </label>
+            </div>
+            <div class="btn-group" data-toggle="buttons">
+              <label class="btn btn-default" id="filterBy-with-docs">
+                <input type="checkbox" name="filter-api-documentation" value="with-docs">
+                {{_ "catalog_toolbar_filterOptions_apisWithDocumentation" }}
+              </label>
+            </div>
           </div>
-        </div>
         {{/ if }}
+
         <div class="nav navbar-nav navbar-right">
           <a href="/rss/apis" target="_blank" class="rss-feed fa fa-rss-square fa-3x btn" title="{{_ 'apisRssIcon_tooltipText_Rss'}}">
           </a>