Updating StatsView to use AppModel nodeId

NCEAS · Feb 18, 2020 · 71c853d · 71c853d
1 parent 8aed303
commit 71c853d
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 36 deletions.
diff --git a/src/js/models/AppModel.js b/src/js/models/AppModel.js
@@ -148,6 +148,12 @@ define(['jquery', 'underscore', 'backbone'],
       */
       metricsUrl: 'https://logproc-stage-ucsb-1.test.dataone.org/metrics',
 
+      // Metrics Falgs for the /profile view (summary view)
+      hideSummaryCitationsChart: false,
+      hideSummaryDownloadsChart: false,
+      hideSummaryMetadataAssessment: true,
+      hideSummaryViewsChart: false,
+
       /**
       * Metrics flag for the Dataset Landing Page
       * Enable this flag to enable metrics display

diff --git a/src/js/routers/router.js b/src/js/routers/router.js
@@ -409,17 +409,14 @@ function ($, _, Backbone) {
 			if(!username || !MetacatUI.appModel.get("enableUserProfiles")){
 				this.routeHistory.push("summary");
 
-				var viewOptions = { nodeId: "urn:node:CN" };
+				// flag indicating /profile view
+				var viewOptions = { nodeSummaryView: true };
 
 				if(!MetacatUI.appView.statsView){
 
 					require(['views/StatsView'], function(StatsView){
 						MetacatUI.appView.statsView = new StatsView({
-							userType: "repository",
-							hideMetadataAssessment: true,
-							hideCitationsChart: false,
-							hideDownloadsChart: false,
-							hideViewsChart: false
+							userType: "repository"
 						});
 
 						MetacatUI.appView.showView(MetacatUI.appView.statsView, viewOptions);

diff --git a/src/js/themes/arctic/models/AppModel.js b/src/js/themes/arctic/models/AppModel.js
@@ -129,7 +129,13 @@ define(['jquery', 'underscore', 'backbone'],
       mdqAggregatedSuiteLabels: ["FAIR Suite v1.0"],
 
       // Metrics endpoint url
-      metricsUrl: 'https://logproc-stage-ucsb-1.test.dataone.org/test/metrics',
+      metricsUrl: 'https://logproc-stage-ucsb-1.test.dataone.org/metrics',
+
+      // Metrics Falgs for the /profile view (summary view)
+      hideSummaryCitationsChart: false,
+      hideSummaryDownloadsChart: false,
+      hideSummaryMetadataAssessment: true,
+      hideSummaryViewsChart: false,
 
       // Metrics flags for the Dataset Landing Page
       // Enable these flags to enable metrics display

diff --git a/src/js/themes/arctic/routers/router.js b/src/js/themes/arctic/routers/router.js
@@ -224,17 +224,14 @@ function ($, _, Backbone) {
 			if(!username || !MetacatUI.appModel.get("enableUserProfiles")){
 				this.routeHistory.push("summary");
 
-				var viewOptions = { nodeId: "urn:node:ARCTIC" };
+				// flag indicating /profile view
+				var viewOptions = { nodeSummaryView: true };
 
 				if(!MetacatUI.appView.statsView){
 
 					require(['views/StatsView'], function(StatsView){
 						MetacatUI.appView.statsView = new StatsView({
-							userType: "repository",
-							hideMetadataAssessment: true,
-							hideCitationsChart: false,
-							hideDownloadsChart: false,
-							hideViewsChart: false
+							userType: "repository"
 						});
 
 						MetacatUI.appView.showView(MetacatUI.appView.statsView, viewOptions);

diff --git a/src/js/themes/dataone/models/AppModel.js b/src/js/themes/dataone/models/AppModel.js
@@ -92,6 +92,13 @@ define(['jquery', 'underscore', 'backbone'],
       // Metrics endpoint url
       metricsUrl: 'https://logproc-stage-ucsb-1.test.dataone.org/metrics',
 
+      // Metrics Falgs for the /profile view (summary view)
+      hideSummaryCitationsChart: false,
+      hideSummaryDownloadsChart: false,
+      hideSummaryMetadataAssessment: true,
+      hideSummaryViewsChart: false,
+
+
       // Metrics flags for the Dataset Landing Page
       // Enable these flags to enable metrics display
       displayDatasetMetrics: true,

diff --git a/src/js/themes/dataone/routers/router.js b/src/js/themes/dataone/routers/router.js
@@ -254,17 +254,14 @@ function ($, _, Backbone) {
 			if(!username || !MetacatUI.appModel.get("enableUserProfiles")){
 				this.routeHistory.push("summary");
 
-				var viewOptions = { nodeId: "urn:node:CN" };
+				// flag indicating /profile view
+				var viewOptions = { nodeSummaryView: true };
 
 				if(!MetacatUI.appView.statsView){
 
 					require(['views/StatsView'], function(StatsView){
 						MetacatUI.appView.statsView = new StatsView({
-							userType: "repository",
-							hideMetadataAssessment: true,
-							hideCitationsChart: false,
-							hideDownloadsChart: false,
-							hideViewsChart: false
+							userType: "repository"
 						});
 
 						MetacatUI.appView.showView(MetacatUI.appView.statsView, viewOptions);

diff --git a/src/js/themes/goa/routers/router.js b/src/js/themes/goa/routers/router.js
@@ -227,17 +227,13 @@ function ($, _, Backbone) {
 			if(!username || !MetacatUI.appModel.get("enableUserProfiles")){
 				this.routeHistory.push("summary");
 
-				var viewOptions = { nodeId: "urn:node:GOA" };
+				var viewOptions = { nodeSummaryView: true };
 
 				if(!MetacatUI.appView.statsView){
 
 					require(['views/StatsView'], function(StatsView){
 						MetacatUI.appView.statsView = new StatsView({
-							userType: "repository",
-							hideMetadataAssessment: true,
-							hideCitationsChart: false,
-							hideDownloadsChart: false,
-							hideViewsChart: false
+							userType: "repository"
 						});
 
 						MetacatUI.appView.showView(MetacatUI.appView.statsView, viewOptions);

diff --git a/src/js/themes/knb/models/AppModel.js b/src/js/themes/knb/models/AppModel.js
@@ -132,7 +132,13 @@ define(['jquery', 'underscore', 'backbone'],
       mdqAggregatedSuiteLabels: ["FAIR Suite v1.0"],
 
       // Metrics endpoint url
-      metricsUrl: 'https://logproc-stage-ucsb-1.test.dataone.org/test/metrics',
+      metricsUrl: 'https://logproc-stage-ucsb-1.test.dataone.org/metrics',
+
+      // Metrics Falgs for the /profile view (summary view)
+      hideSummaryCitationsChart: false,
+      hideSummaryDownloadsChart: false,
+      hideSummaryMetadataAssessment: true,
+      hideSummaryViewsChart: false,
 
       // Metrics flags for the Dataset Landing Page
       // Enable these flags to enable metrics display

diff --git a/src/js/themes/knb/routers/router.js b/src/js/themes/knb/routers/router.js
@@ -44,18 +44,15 @@ function($, _, Backbone, BaseRouter) {
 
           if(!username || !MetacatUI.appModel.get("enableUserProfiles")){
             this.routeHistory.push("summary");
-
-            var viewOptions = { nodeId: "urn:node:KNB" };
+
+            // flag indicating /profile view
+            var viewOptions = { nodeSummaryView: true };
 
             if(!MetacatUI.appView.statsView){
 
               require(['views/StatsView'], function(StatsView){
                 MetacatUI.appView.statsView = new StatsView({
-                  userType: "repository",
-                  hideMetadataAssessment: true,
-                  hideCitationsChart: false,
-                  hideDownloadsChart: false,
-                  hideViewsChart: false
+                  userType: "repository"
                 });
 
                 MetacatUI.appView.showView(MetacatUI.appView.statsView, viewOptions);

diff --git a/src/js/views/StatsView.js b/src/js/views/StatsView.js
@@ -57,7 +57,15 @@ define(['jquery', 'underscore', 'backbone', 'd3', 'LineChart', 'BarChart', 'Donu
 			if ( !options )
 				options = {};
 
-			var nodeId = (typeof options.nodeId === "undefined") ? "undefined" : options.nodeId;
+			if ( options.nodeSummaryView ) {
+				var nodeId = MetacatUI.appModel.get("nodeId");
+
+				// Overwrite the metrics display flags as set in the AppModel
+				this.hideMetadataAssessment = MetacatUI.appModel.get("hideSummaryMetadataAssessment");
+				this.hideCitationsChart = MetacatUI.appModel.get("hideSummaryCitationsChart");
+				this.hideDownloadsChart = MetacatUI.appModel.get("hideSummaryDownloadsChart");
+				this.hideViewsChart = MetacatUI.appModel.get("hideSummaryViewsChart");
+			}
 
 			if ( typeof this.metricsModel === "undefined" ) {
 
@@ -86,15 +94,19 @@ define(['jquery', 'underscore', 'backbone', 'd3', 'LineChart', 'BarChart', 'Donu
 			//Clear the page
 			this.$el.html("");
 
+			var view  = this;
+
 			if (this.userType == "portal" || this.userType === "repository") {
 				if (this.metricsModel.get("totalViews") !== null) {
 					this.renderMetrics();
 				}
 				else{
-					this.listenTo(this.metricsModel, "sync" , this.renderMetrics);
+
+					// render metrics on fetch success.
+					this.listenTo(view.metricsModel, "sync" , this.renderMetrics);
 
 					// in case when there is an error for the fetch call.
-					this.listenTo(this.metricsModel, "error", this.renderUsageMetricsError);
+					this.listenTo(view.metricsModel, "error", this.renderUsageMetricsError);
 				}
 			}