Merge branch 'develop' into version-updates-2.29.0

src/js/collections/AccessPolicy.js

@@ -8,6 +8,7 @@ define(["jquery", "underscore", "backbone", "models/AccessRule"],
        * @classdesc An AccessPolicy collection is a collection of AccessRules that specify
        * the permissions set on a DataONEObject
        * @classcategory Collections
+       * @extends Backbone.Collection
        */
       var AccessPolicy = Backbone.Collection.extend(
         /** @lends AccessPolicy.prototype */

src/js/collections/QualityReport.js

@@ -13,7 +13,8 @@ define(['jquery', 'underscore', 'backbone', 'rdflib', "uuid", "md5",
      @extends Backbone.Collection
      @constructor
     */
-    var QualityReport = Backbone.Collection.extend({
+    var QualityReport = Backbone.Collection.extend(
+      /** @lends QualityReport.prototype */{
 
       //The name of this type of collection
       type: "QualityReport",

src/js/collections/Units.js

@@ -7,6 +7,7 @@ define(["jquery", "underscore", "backbone", "x2js", "models/metadata/eml211/EMLU
      * @class Units
      * @classdesc Units represents the Ecological Metadata Language units list
      * @classcategory Collections
+     * @extends Backbone.Collection
      */
     var Units = Backbone.Collection.extend(
       /** @lends Units.prototype */{

src/js/collections/UserGroup.js

@@ -6,7 +6,8 @@ define(['jquery', 'underscore', 'backbone', 'models/UserModel'],
 	/**
 	 * @class UserGroup
 	 * @classdesc The collection of Users that represent a DataONE group
-   * @classcategory Collections
+     * @classcategory Collections
+     * @extends Backbone.Collection
 	 */
 	var UserGroup = Backbone.Collection.extend(
     /** @lends UserGroup.prototype */{

src/js/collections/bookkeeper/Quotas.js

@@ -10,6 +10,7 @@ define(["jquery", "underscore", "backbone", "models/bookkeeper/Quota"],
    * per unit to help with communicating limit warnings.
    * @classcategory Collections/Bookkeeper
    * @since 2.14.0
+   * @extends Backbone.Collection
    */
   var Quotas = Backbone.Collection.extend(
     /** @lends Quotas.prototype */ {

src/js/collections/bookkeeper/Usages.js

@@ -11,6 +11,7 @@ define(["jquery", "underscore", "backbone", "models/bookkeeper/Usage", "models/b
    * This collection also stores a reference to the Quota model associated with these Usages.
    * @classcategory Collections/Bookkeeper
    * @since 2.14.0
+   * @extends Backbone.Collection
    */
   var Usages = Backbone.Collection.extend(
     /** @lends Usages.prototype */ {

src/js/collections/metadata/eml/EMLAnnotations.js

@@ -7,6 +7,7 @@ function($, _, Backbone, EMLAnnotation){
    * @classdesc A collection of EMLAnnotations.
    * @classcategory Collections/Metadata/EML
    * @since 2.19.0
+   * @extends Backbone.Collection
    */
   var EMLAnnotations = Backbone.Collection.extend(
     /** @lends EMLAnnotations.prototype */

src/js/collections/metadata/eml/EMLMissingValueCodes.js

@@ -9,6 +9,7 @@ define(["backbone", "models/metadata/eml211/EMLMissingValueCode"], function (
    * @classdesc A collection of EMLMissingValueCodes.
    * @classcategory Collections/Metadata/EML
    * @since 2.26.0
+   * @extends Backbone.Collection
    */
   var EMLMissingValueCodes = Backbone.Collection.extend(
     /** @lends EMLMissingValueCodes.prototype */

src/js/models/AccessRule.js

@@ -7,6 +7,7 @@ define(['jquery', 'underscore', 'backbone'],
    * @class AccessRule
    * @classdesc A model that specifies a single permission set on a DataONEObject
    * @classcategory Models
+   * @extends Backbone.Model
    */
 	var AccessRule = Backbone.Model.extend(
     /** @lends AccessRule */

src/js/models/AppModel.js

@@ -881,33 +881,33 @@ define(['jquery', 'underscore', 'backbone'],
       /**
       * The URL for the DataONE metadata assessment service
       * @type {string}
-      * @default "https://docker-ucsb-4.dataone.org:30443/quality"
+      * @default "https://api.dataone.org/quality"
       */
-      mdqBaseUrl: "https://docker-ucsb-4.dataone.org:30443/quality",
+      mdqBaseUrl: "https://api.dataone.org/quality",
       /**
       * Metadata Assessment Suite IDs for the dataset assessment reports.
       * @type {string[]}
-      * @default ["FAIR-suite-0.3.1"]
+      * @default ["FAIR-suite-0.4.0"]
       */
-      mdqSuiteIds: ["FAIR-suite-0.3.1"],
+      mdqSuiteIds: ["FAIR-suite-0.4.0"],
       /**
       * Metadata Assessment Suite labels for the dataset assessment reports
       * @type {string[]}
-      * @default ["FAIR Suite v0.3.1"]
+      * @default ["FAIR Suite v0.4.0"]
       */
-      mdqSuiteLabels: ["FAIR Suite v0.3.1"],
+      mdqSuiteLabels: ["FAIR Suite v0.4.0"],
       /**
       * Metadata Assessment Suite IDs for the aggregated assessment charts
       * @type {string[]}
-      * @default ["FAIR-suite-0.3.1"]
+      * @default ["FAIR-suite-0.4.0"]
       */
-      mdqAggregatedSuiteIds: ["FAIR-suite-0.3.1"],
+      mdqAggregatedSuiteIds: ["FAIR-suite-0.4.0"],
       /**
       * Metadata Assessment Suite labels for the aggregated assessment charts
       * @type {string[]}
-      * @default ["FAIR Suite v0.3.1"]
+      * @default ["FAIR Suite v0.4.0"]
       */
-      mdqAggregatedSuiteLabels: ["FAIR Suite v0.3.1"],
+      mdqAggregatedSuiteLabels: ["FAIR Suite v0.4.0"],
       /**
       * The metadata formats for which to display metadata assessment reports
       * @type {string[]}

src/js/models/LogsSearch.js

@@ -10,7 +10,8 @@ define(['jquery', 'underscore', 'backbone', 'models/Search'],
   * @deprecated
   * @classcategory Deprecated
   */
-	var LogsSearch = SearchModel.extend({
+	var LogsSearch = SearchModel.extend(
+		/** @lends LogsSearch.prototype */{
 		// This model contains all of the search/filter terms
 		/*
 		 * Search filters can be either plain text or a filter object with the following options:

src/js/models/LookupModel.js

@@ -12,6 +12,7 @@ define(["jquery", "jqueryui", "underscore", "backbone"], function (
    * @classdesc A utility model that contains functions for looking up values
    * from various services
    * @classcategory Models
+   * @extends Backbone.Model
    */
   var LookupModel = Backbone.Model.extend(
     /** @lends LookupModel.prototype */ {

src/js/models/Map.js

@@ -7,6 +7,7 @@ define(['jquery', 'underscore', 'backbone', 'gmaps'],
   * @class Map
   * @classdesc The Map Model represents all of the settings and options for a Google Map.
   * @classcategory Models
+  * @extends Backbone.Model
   */
 	var Map = Backbone.Model.extend(
     /** @lends Map.prototype */{

src/js/models/QualityCheckModel.js

@@ -1,7 +1,7 @@
 /* global define */
 "use strict";
 
-define(['jquery', 'underscore', 'backbone'], function($, _, Backbone) {
+define(['jquery', 'underscore', 'backbone'], function ($, _, Backbone) {
 
     /**
      * @class QualityCheck
@@ -11,28 +11,30 @@ define(['jquery', 'underscore', 'backbone'], function($, _, Backbone) {
      * future it may be used to request/fetch quality result for a single
      * quality check (and not an entire suite).
      * @classcategory Models
+     * @extends Backbone.Model
      */
-    var QualityCheck = Backbone.Model.extend({
+    var QualityCheck = Backbone.Model.extend(
+        /** @lends QualityCheck.prototype */{
 
-        /* The default object format fields */
-        defaults: function() {
-            return {
-                check: null,
-                output: null,
-                status: null,
-                timestamp: null
-            };
-        },
+            /* The default object format fields */
+            defaults: function () {
+                return {
+                    check: null,
+                    output: null,
+                    status: null,
+                    timestamp: null
+                };
+            },
 
-        /* Constructs a new instance */
-        initialize: function(attrs, options) {
-        },
+            /* Constructs a new instance */
+            initialize: function (attrs, options) {
+            },
 
-        /* No op - Formats are read only */
-        save: function() {
-            return false;
-        }
-    });
+            /* No op - Formats are read only */
+            save: function () {
+                return false;
+            }
+        });
 
     return QualityCheck;
 });

src/js/models/SolrResult.js

@@ -6,6 +6,7 @@ define(['jquery', 'underscore', 'backbone'],
   * @class SolrResult
   * @classdesc A single result from the Solr search service
   * @classcategory Models
+  * @extends Backbone.Model
   */
 	var SolrResult = Backbone.Model.extend(
     /** @lends SolrResult.prototype */{

src/js/models/bookkeeper/Quota.js

@@ -15,6 +15,7 @@ define(["jquery",
      * @name Quota
      * @since 2.14.0
      * @constructor
+     * @extends Backbone.Model
     */
     var Quota = Backbone.Model.extend(
       /** @lends Quota.prototype */ {

src/js/models/bookkeeper/Subscription.js

@@ -15,6 +15,7 @@ define(["jquery",
      * @name Subscription
      * @since 2.14.0
      * @constructor
+     * @extends Backbone.Model
     */
     var Subscription = Backbone.Model.extend(
       /** @lends Subscription.prototype */ {

src/js/models/bookkeeper/Usage.js

@@ -13,6 +13,7 @@ define(["jquery",
      * @class Usage
      * @name Usage
      * @since 2.14.0
+     * @extends Backbone.Model
      * @constructor
     */
     var Usage = Backbone.Model.extend(

src/js/models/formats/ObjectFormat.js

@@ -8,6 +8,7 @@ define(['jquery', 'underscore', 'backbone'], function($, _, Backbone) {
      * @classdesc An ObjectFormat represents a V2 DataONE object format
      * See https://purl.dataone.org/architecture/apis/Types2.html#v2_0.Types.ObjectFormat
      * @classcategory Models/Formats
+     * @extends Backbone.Model
      */
     var ObjectFormat = Backbone.Model.extend(
       /** @lends ObjectFormat.prototype */{

src/js/models/geocoder/GeocodedLocation.js

@@ -10,36 +10,38 @@ define(
     * navigating to on a map.
     * @classcategory Models/Geocoder
     * @since 2.28.0
+    * @extends Backbone.Model
     */
-    const GeocodedLocation = Backbone.Model.extend({
-      /**
-       * Overrides the default Backbone.Model.defaults() function to specify
-       * default attributes.
-       * @name GeocodedLocation#defaults
-       * @type {Object}
-       * @property {GeoBoundingBox} box Bounding box representing this location 
-       * on a map.
-       * @property {string} displayName A name that can be displayed to the user
-       * representing this location.
-       */
-      defaults() {
-        return {
-          box: new GeoBoundingBox,
-          displayName: '',
-        };
-      },
+    const GeocodedLocation = Backbone.Model.extend(
+      /** @lends GeocodedLocation.prototype */{
+        /**
+         * Overrides the default Backbone.Model.defaults() function to specify
+         * default attributes.
+         * @name GeocodedLocation#defaults
+         * @type {Object}
+         * @property {GeoBoundingBox} box Bounding box representing this location 
+         * on a map.
+         * @property {string} displayName A name that can be displayed to the user
+         * representing this location.
+         */
+        defaults() {
+          return {
+            box: new GeoBoundingBox,
+            displayName: '',
+          };
+        },
 
-      /**
-       * @typedef {Object} GeocodedLocationOptions
-       * @property {Object} box An object representing a boundary around a
-       * location on a map. 
-       * @property {string} displayName A display name for the location. 
-       */
-      initialize({ box: { north, south, east, west } = {}, displayName = '' } = {}) {
-        this.set('box', new GeoBoundingBox({ north, south, east, west }));
-        this.set('displayName', displayName);
-      },
-    });
+        /**
+         * @typedef {Object} GeocodedLocationOptions
+         * @property {Object} box An object representing a boundary around a
+         * location on a map. 
+         * @property {string} displayName A display name for the location. 
+         */
+        initialize({ box: { north, south, east, west } = {}, displayName = '' } = {}) {
+          this.set('box', new GeoBoundingBox({ north, south, east, west }));
+          this.set('displayName', displayName);
+        },
+      });
 
     return GeocodedLocation;
   });

src/js/models/geocoder/Prediction.js

@@ -7,34 +7,36 @@ define(['backbone'], (Backbone) => {
   * autocompletion search.
   * @classcategory Models/Geocoder
   * @since 2.28.0
+  * @extends Backbone.Model
   */
-  const Prediction = Backbone.Model.extend({
-    /**
-     * Overrides the default Backbone.Model.defaults() function to specify
-     * default attributes for the Map
-     * @name Prediction#defaults
-     * @type {Object}
-     * @property {string} description A user-friendly description of a Google
-     * Maps Place.
-     * @property {string} googleMapsPlaceId Unique identifier that can be 
-     * geocoded by the Google Maps Geocoder API.
-     */
-    defaults() {
-      return { description: '', googleMapsPlaceId: '' };
-    },
+  const Prediction = Backbone.Model.extend(
+    /** @lends Prediction.prototype */{
+      /**
+       * Overrides the default Backbone.Model.defaults() function to specify
+       * default attributes for the Map
+       * @name Prediction#defaults
+       * @type {Object}
+       * @property {string} description A user-friendly description of a Google
+       * Maps Place.
+       * @property {string} googleMapsPlaceId Unique identifier that can be 
+       * geocoded by the Google Maps Geocoder API.
+       */
+      defaults() {
+        return { description: '', googleMapsPlaceId: '' };
+      },
 
-    /**
-     * @typedef {Object} PredictionOptions
-     * @property {string} description A string describing the location
-     * represented by the Prediction. 
-     * @property {string} googleMapsPlaceId The place ID that is used to
-     * uniquely identify a place in Google Maps API. 
-     */
-    initialize({ description, googleMapsPlaceId, } = {}) {
-      this.set('description', description);
-      this.set('googleMapsPlaceId', googleMapsPlaceId);
-    },
-  });
+      /**
+       * @typedef {Object} PredictionOptions
+       * @property {string} description A string describing the location
+       * represented by the Prediction. 
+       * @property {string} googleMapsPlaceId The place ID that is used to
+       * uniquely identify a place in Google Maps API. 
+       */
+      initialize({ description, googleMapsPlaceId, } = {}) {
+        this.set('description', description);
+        this.set('googleMapsPlaceId', googleMapsPlaceId);
+      },
+    });
 
   return Prediction;
 });