Feature 2079 file display

src/css/metacatui-common.css

@@ -544,6 +544,64 @@ text-shadow: none;
 .data-tag-icon.crimson g{
   fill: #800000;
 }
+/******************************************
+** CatalogSearchView ***
+******************************************/
+.catalog-search-view .catalog-search-inner{
+	display: grid;
+	justify-content: stretch;
+	align-items: stretch;
+	grid-template-columns: auto 1fr 1fr;
+}
+.catalog-search-view .filter-groups-container {
+	width: 215px;
+	padding: var(--pad)
+}
+.catalog-search-view .search-results-container,
+.catalog-search-view .map-container {
+}
+.catalog-search-body.mapMode{
+	height: 100vh;
+	width: 100vw;
+	padding-bottom: 0px;
+	display: grid;
+	align-items: stretch;
+	justify-content: stretch;
+	overflow: hidden;
+}
+.catalog-search-body.mapMode #Content{
+	padding: 40px 0px 0px 0px;
+}
+.catalog-search-body.mapMode .search-results-view .result-row:last-child{
+	margin-bottom: 100px;
+}
+.catalog-search-body.mapMode .search-results-view {
+	overflow-y: scroll;
+	height: 100vh;
+	padding-bottom: 200px; /* Leaving room for the last row to show */
+	padding-right: 15px; /* Padding for the scrollbar */
+}
+.catalog-search-body.mapMode .search-results-panel-container .map-toggle-container{
+    display: none;
+}
+.catalog-search-body.listMode .map-panel-container{
+    display: none;
+}
+.catalog-search-body.listMode .catalog-search-inner{
+	grid-template-columns: auto 1fr 0;
+}
+.catalog-search-view .cesium-widget-view {
+	width: inherit;
+	margin-left: 0;
+}
+.search-results-view .result-row{
+	padding: var(--pad);
+}
+.catalog-search-view .no-search-results{
+	padding: var(--pad);
+	text-align: center;
+}
+
 /******************************************
 ** Results and Result Rows ***
 ******************************************/
@@ -9038,4 +9096,90 @@ body > #extension-is-installed{
 	margin-left: 5px;
 }
 
+#data-package-table-head {
+	position: sticky;
+    top: 0;
+    z-index: 1;
+}
+
+#data-package-table-head > .file-header > th {
+	background-color: #FDFDFD;
+	border-bottom: 1px solid #E3E3E3;
+	height: 32px;
+	position: sticky;
+    top: 0;
+    z-index: -2;
+}
+
+#data-package-table-head > .file-header > th:not(:last-child) {
+	border-right: 1px solid #E3E3E3;
+	height: 30px;
+}
+
+#data-package-table-body > tr > td:first-child {
+	cursor: default;
+}
+
+.file-table-container {
+	height: max-content;
+	max-height: 25.4em;
+	overflow-y: scroll;
+	border: 1px solid #E3E3E3;
+    border-radius: 4px 4px 4px 4px;
+}
+
+.file-table-container::-webkit-scrollbar {
+	-webkit-appearance: none;
+	width: 10px;
+  }
+
+.file-table-container::-webkit-scrollbar-thumb {
+	border-radius: 5px;
+	background-color: rgba(0,0,0,.5);
+	-webkit-box-shadow: 0 0 1px rgba(255,255,255,.5);
+  }
+
+.btn.btn-rounded.action {
+    border-radius: 50%;
+	height: 15px;
+	width: 15px;
+}
+
+.btn.btn-rounded.action.downloadAction{
+	border: none;
+}
+.btn.btn-rounded.action.downloadAction > i{
+	margin-left: -4px;
+}
+.data-package-item {
+	height: 38px;
+}
+
+.data-package-file-table > .data-package-item > .file-actions > .action
+	.btn, .btn-primary, 
+	.btn-large, .btn-small, 
+	.btn-mini {
+	font-weight: 400;
+	background-image: none;
+	background-repeat: no-repeat;
+	background-color: transparent;
+	border: 1px solid #146660;
+	text-shadow: none;
+	box-shadow: none;
+	color: #146660;
+	padding: .5em;
+  }
+
+.data-package-file-table > .data-package-item > .file-actions > .action
+  .btn:hover, .btn:focus,
+  .header .nav li .btn:hover, .header nav li .btn:focus{
+	  background-color: #146660;
+	  color: #FFF;
+	  border: 0px;
+	  box-shadow: none;
+	  border: 1px solid #146660;
+  }
 
+.data-package-file-table  div.tooltip{
+	text-wrap: wrap;
+  }

src/js/collections/DataPackage.js

@@ -456,15 +456,21 @@ define(['jquery', 'underscore', 'backbone', 'rdflib', "uuid", "md5",
                   ORE =     this.rdf.Namespace(this.namespaces.ORE),
                   DCTERMS = this.rdf.Namespace(this.namespaces.DCTERMS),
                   CITO =    this.rdf.Namespace(this.namespaces.CITO),
+                  PROV =    this.rdf.Namespace(this.namespaces.PROV),
                   XSD =     this.rdf.Namespace(this.namespaces.XSD);
 
               var memberStatements = [],
+                  atLocationStatements = [],
                   memberURIParts,
                   memberPIDStr,
                   memberPID,
                   memberPIDs = [],
                   memberModel,
                   documentsStatements,
+                  objectParts,
+                  objectPIDStr,
+                  objectPID,
+                  objectAtLocationValue,
                   scimetaID, // documentor
                   scidataID, // documentee
                   models = []; // the models returned by parse()
@@ -569,6 +575,23 @@ define(['jquery', 'underscore', 'backbone', 'rdflib', "uuid", "md5",
                 //Save the list of science metadata pids
                 this.sciMetaPids = sciMetaPids;
 
+                // Parse atLocation
+                var atLocationObject = {};
+                atLocationStatements = this.dataPackageGraph.statementsMatching(
+                  undefined, PROV("atLocation"), undefined, undefined);
+
+                // Get system metadata for each member to eval the formatId
+                _.each(atLocationStatements, function(atLocationStatement){
+                    objectParts = atLocationStatement.subject.value.split("/");
+                    objectPIDStr = _.last(objectParts);
+                    objectPID = decodeURIComponent(objectPIDStr);
+                    objectAtLocationValue = atLocationStatement.object.value;
+
+                    atLocationObject[objectPID] = objectAtLocationValue;
+                }, this);
+
+                this.atLocationObject = atLocationObject;
+
                 //Put the science metadata pids first
                 memberPIDs = _.difference(memberPIDs, sciMetaPids);
                 _.each(_.uniq(sciMetaPids), function(id){ memberPIDs.unshift(id); });
@@ -1730,8 +1753,11 @@ define(['jquery', 'underscore', 'backbone', 'rdflib', "uuid", "md5",
           });
 
           //If there are any models that are not synced yet, the collection is not complete
-          if( notSynced.length > 0 )
+          if( notSynced.length > 0 ) {
+            var view = this;
+              this.listenToOnce(notSynced[0], "sync", this.triggerComplete, notSynced[0]);
               return;
+          }
 
           //If the number of models in this collection does not equal the number of objects referenced in the RDF XML, the collection is not complete
           if(this.originalMembers.length > this.length)
@@ -3122,6 +3148,11 @@ define(['jquery', 'underscore', 'backbone', 'rdflib', "uuid", "md5",
                   }
                 });
               }
+            },
+
+
+            getAtLocation: function() {
+              return this.atLocationObject;
             }
         });
 

src/js/models/AppModel.js

@@ -91,7 +91,7 @@ define(['jquery', 'underscore', 'backbone'],
       * DataCatalog). This can be set to either "google" (the default), or "cesium". To
       * use Google maps, the {@link AppConfig#googleAnalyticsKey} must be set. To use
       * Cesium maps, the {@link AppConfig#enableCesium} property must be set to true, and
-      * the {@link AppConfig#cesiumToken} must be set. DEPRECATION NOTE: This configuration 
+      * the {@link AppConfig#cesiumToken} must be set. DEPRECATION NOTE: This configuration
       * is deprecated along with the {@link DataCatalogView} and {@link DataCatalogViewWithFilters}
       * views and Google Maps. The {@link CatalogSearchView} will replace these as the primary search view and will only
       * support Cesium, not Google Maps.
@@ -103,14 +103,23 @@ define(['jquery', 'underscore', 'backbone'],
       dataCatalogMap: "google",
 
       /**
-       * The default options for the Cesium map used in the
-       * {@link CatalogSearchView} for searching the data catalog. Add custom
-       * layers, a default home position (for example, zoom into your area of
-       * research), and enable/disable map widgets. See {@link MapConfig} for
-       * the full suite of options. Use any satellite imagery layer of your
-       * choice, such as a self-hosted imagery layer or hosted on Cesium Ion. If
-       * no layer of type `CesiumGeohash` is included, a geohash layer will be
-       * added automatically in order to show the search results on the map.
+      * Set this option to true to display the filtering button for data package table
+      * @type {boolean}
+      */
+      dataPackageFiltering: false,
+
+      /**
+      * Set this option to true to display the sorting button for data package table
+      * @type {boolean}
+      */
+      dataPackageSorting: false,
+
+      /**
+       * The default options for the Cesium map used in the {@link CatalogSearchView} for searching the data
+       * catalog. Add custom layers, a default home position (for example, zoom into your area of research),
+       * and enable/disable map widgets. See {@link MapConfig} for the full suite of options. Keep the `CesiumGeohash`
+       * layer here in order to show the search results in the map as geohash boxes. Use any satellite imagery
+       * layer of your choice, such as a self-hosted imagery layer or hosted on Cesium Ion.
        * @type {MapConfig}
        * @since 2.22.0
        */
@@ -359,25 +368,25 @@ define(['jquery', 'underscore', 'backbone'],
         contact: true
       },
 
-      /** 
-       * A list of required fields for each EMLParty (People) in the dataset editor. 
+      /**
+       * A list of required fields for each EMLParty (People) in the dataset editor.
        * This is a literal object where the keys are the EML Party type (e.g. creator, principalInvestigator) {@link see EMLParty.partytypes}
        * and the values are arrays of field names.
        * By default, EMLPartys are *always* required to have an individual's name, position name, or organization name.
        * @type {object}
        * @since 2.21.0
-       * @example 
+       * @example
        *   {
        *      contact: ["email"],
        *      creator: ["email", "address", "phone"]
        *      principalInvestigator: ["organizationName"]
        *   }
-       * @default 
+       * @default
        *  {
        *  }
       */
       emlEditorRequiredFields_EMLParty: {
-       
+
       },
 
       /**
@@ -511,7 +520,7 @@ define(['jquery', 'underscore', 'backbone'],
       * @since 2.19.0
       */
       customEMLMethods: [],
-      
+
       /**
        * Configuration options for a drop down list of taxa.
        * @typedef {object} AppConfig#quickAddTaxaList
@@ -1679,14 +1688,14 @@ define(['jquery', 'underscore', 'backbone'],
        * @since 2.17.0
        */
       queryIdentifierFields: ["id", "identifier", "seriesId", "isPartOf"],
-      
+
       /**
        * The name of the query fields that specify latitude. Filter models that these
        * fields are handled specially, since they must be a float value and have a
        * pre-determined minRange and maxRange (-90 to 90).
        */
       queryLatitudeFields: ["northBoundCoord", "southBoundCoord"],
-      
+
       /**
        * The name of the query fields that specify longitude. Filter models that these
        * fields are handled specially, since they must be a float value and have a
@@ -1802,8 +1811,8 @@ define(['jquery', 'underscore', 'backbone'],
         }
       ],
 
-      /** 
-       * The document fields to return when conducting a search. This is the list of fields returned by the main catalog search view. 
+      /**
+       * The document fields to return when conducting a search. This is the list of fields returned by the main catalog search view.
        * @type {string[]}
        * @since 2.22.0
        * @example ["id", "title", "obsoletedBy"]