Reverted extra changes back

js/Model.js

@@ -508,6 +508,7 @@ define(
 					this.currentCohortDefinitionInfo([]);
 				} else {
 					const { data: cohortDefinition } = await httpService.doGet(config.api.url + 'cohortdefinition/' + cohortDefinitionId);
+					cohortDefinition.expression = JSON.parse(cohortDefinition.expression);
 					this.currentCohortDefinition(new CohortDefinition(cohortDefinition));
 
 					const { data: generationInfo } = await httpService.doGet(config.api.url + 'cohortdefinition/' + cohortDefinitionId + '/info');					
@@ -518,7 +519,7 @@ define(
 						// Now that we have loaded up the cohort definition, we'll need to
 						// resolve all of the concepts embedded in the concept set collection
 						// to ensure they have all of the proper properties for editing in the cohort
-						// editor
+						// editior
 						if (this.currentCohortDefinition().expression().ConceptSets()) {
 							const identifiers = [];
 							this.currentCohortDefinition().expression().ConceptSets()

js/const.js

@@ -4,7 +4,7 @@ define([
 	],
 	(
 		ko,
-		config,
+    	config,
 	) => {
 
 		const minChartHeight = 300;
@@ -384,22 +384,22 @@ define([
 		}];
 
 		const apiPaths = {
-			role: (id = '') => `${config.api.url}role/${id}`, 
-			roleUsers: roleId => `${config.api.url}role/${roleId}/users`, 
-			permissions: () => `${config.api.url}permission`, 
-			rolePermissions: roleId => `${config.api.url}role/${roleId}/permissions`, 
-			relations: (roleId, relation, ids = []) => `${config.api.url}role/${roleId}/${relation}/${ids.join('+')}`,
+			role: (id = '') => `${config.api.url}role/${id}`,
+      roleUsers: roleId => `${config.api.url}role/${roleId}/users`,
+      permissions: () => `${config.api.url}permission`,
+      rolePermissions: roleId => `${config.api.url}role/${roleId}/permissions`,
+      relations: (roleId, relation, ids = []) => `${config.api.url}role/${roleId}/${relation}/${ids.join('+')}`,
 			jobs: () => `${config.api.url}job/execution?comprehensivePage=true`,
 			job: (id) => `${config.api.url}job/${id}`,
 			jobByName: (name,  type) => `${config.api.url}job/type/${type}/name/${name}`,
 		};
 
-		const applicationStatuses = {
-			initializing: 'initializing', 
-			running: 'running', 
-			noSourcesAvailable: 'no-sources-available', 
-			failed: 'failed',
-		};
+     const applicationStatuses = {
+		  initializing: 'initializing',
+		  running: 'running',
+		  noSourcesAvailable: 'no-sources-available',
+		  failed: 'failed',
+	  };
 
 		const generationStatuses = {
 			STARTED: 'STARTED',

js/pages/cohort-definitions/cohort-definition-manager.js

@@ -221,6 +221,9 @@ define(['jquery', 'knockout', 'text!./cohort-definition-manager.html',
 			this.sharedState = sharedState;
 			this.identifiers = ko.observable();
 			this.sourcecodes = ko.observable();
+			this.isSaveable = ko.pureComputed(() => {
+				return this.dirtyFlag() && this.dirtyFlag().isDirty();
+			});
 			this.conceptLoading = ko.observable(false);
 			this.conceptSetName = ko.observable();
 			this.tabPath = ko.computed(() => {

js/pages/estimation/cca-manager.js

@@ -68,15 +68,15 @@ define([
 			this.loadingMessage = ko.observable(this.defaultLoadingMessage);
 			this.packageName = ko.observable().extend({alphaNumeric: null});
 			this.selectedTabKey = ko.observable(params.routerParams().section);
-			this.isSaving = ko.observable(false);
-			this.isCopying = ko.observable(false);
-			this.isDeleting = ko.observable(false);
+            this.isSaving = ko.observable(false);
+            this.isCopying = ko.observable(false);
+            this.isDeleting = ko.observable(false);
 			this.defaultName = globalConstants.newEntityNames.ple;
 			this.executionTabTitle = config.useExecutionEngine ? "Executions" : "";
 			this.isProcessing = ko.computed(() => {
-				return this.isSaving() || this.isCopying() || this.isDeleting();
-			});
-			this.componentParams = ko.observable({
+                return this.isSaving() || this.isCopying() || this.isDeleting();
+            });
+            this.componentParams = ko.observable({
 				comparisons: sharedState.estimationAnalysis.comparisons,
 				defaultCovariateSettings: this.defaultCovariateSettings,
 				dirtyFlag: sharedState.estimationAnalysis.dirtyFlag,
@@ -88,7 +88,7 @@ define([
 				loadingMessage: this.loadingMessage,
 				packageName: this.packageName,
 				subscriptions: this.subscriptions,
-			});
+            });
 
 			this.isNameFilled = ko.computed(() => {
 				return this.estimationAnalysis() && this.estimationAnalysis().name();

js/pages/estimation/const.js

@@ -8,7 +8,7 @@ define(
 
     const apiPaths = {
       downloadCcaAnalysisPackage: (id, name) => `estimation/${id}/download?packageName=${name}`,
-      downloadResults: id => `estimation/generation/${id}/result`,
+			downloadResults: id => `estimation/generation/${id}/result`,
     };
 
     const paths = {
@@ -19,7 +19,7 @@ define(
         browser: () => '#/estimation',
     };
 
-    const estimationGenerationStatus = consts.generationStatuses;
+		const estimationGenerationStatus = consts.generationStatuses;
 
     const conceptSetCrossReference = {
       targetComparatorOutcome: {

js/pages/estimation/estimation-browser.js

@@ -62,7 +62,7 @@ define([
 			this.columns = [
 				{
 					title: 'Id',
-					data: 'id'
+					data: 'estimationId'
 				},
 				{
 					title: 'Type',
@@ -72,7 +72,7 @@ define([
 				{
 					title: 'Name',
 					render: datatableUtils.getLinkFormatter(d => ({
-						link: constants.paths.ccaAnalysisDash(d.id),
+						link: constants.paths.ccaAnalysisDash(d.estimationId),
 						label: d['name']
 					})),
 				},
@@ -92,7 +92,7 @@ define([
 				},
 				{
 					title: 'Author',
-					data: 'createdBy.login'
+					data: 'createdBy'
 				}
 			];
 		}

js/pages/estimation/index.js

@@ -1,6 +1,6 @@
 define(
   (require, exports) => {
-    const ko = require('knockout');
+	  const ko = require('knockout');  	
     const buildRoutes = require('./routes');
     const appState = require('atlas-state');
     const constants = require('./const');
@@ -27,8 +27,8 @@ define(
       title: 'Estimation',
       buildRoutes,
       navUrl: navUrl,
-      icon: 'balance-scale', 
-      statusCss: statusCss
+      icon: 'balance-scale',
+			statusCss: statusCss
     };
   }
 );

js/pages/incidence-rates/ir-manager.js

@@ -317,7 +317,7 @@ define([
 			this.loading(true);
 			const analysis = await IRAnalysisService.copyAnalysis(this.selectedAnalysisId());
 			this.selectedAnalysis(new IRAnalysisDefinition(analysis));
-			this.selectedAnalysisId(analysis.id);
+			this.selectedAnalysisId(analysis.id)
 			this.dirtyFlag(new ohdsiUtil.dirtyFlag(this.selectedAnalysis()));
 			this.isCopying(false);
 			this.loading(false);
@@ -338,7 +338,7 @@ define([
 			if (this.dirtyFlag().isDirty() && !confirm("Incidence Rate Analysis changes are not saved. Would you like to continue?")) {
 				return;
 			}
-			this.close();
+			this.close()
 			commonUtils.routeTo(constants.apiPaths.analysis());
 		}
 

js/pages/prediction/prediction-browser.js

@@ -62,7 +62,7 @@ define([
 			this.columns = [
 				{
 					title: 'Id',
-					data: 'id'
+					data: 'analysisId'
 				},
 				{
 					title: 'Type',
@@ -72,7 +72,7 @@ define([
 				{
 					title: 'Name',
 					render: datatableUtils.getLinkFormatter(d => ({
-						link: constants.paths.analysis(d.id),
+						link: constants.paths.analysis(d.analysisId),
 						label: d['name']
 					})),
 
@@ -93,7 +93,7 @@ define([
 				},
 				{
 					title: 'Author',
-					data: 'createdBy.login'
+					data: 'createdBy'
 				}
 			];
 		}

js/pages/prediction/prediction-manager.js

@@ -76,13 +76,13 @@ define([
 			this.defaultTemporalCovariateSettings = null;
 			this.fullSpecification = ko.observable(null);
 			this.packageName = ko.observable().extend({alphaNumeric: null});
-			this.isSaving = ko.observable(false);
-			this.isCopying = ko.observable(false);
+            this.isSaving = ko.observable(false);
+            this.isCopying = ko.observable(false);
 			this.isDeleting = ko.observable(false);
 			this.executionTabTitle = config.useExecutionEngine ? "Executions" : "";
-			this.isProcessing = ko.computed(() => {
-				return this.isSaving() || this.isCopying() || this.isDeleting();
-			});
+            this.isProcessing = ko.computed(() => {
+                return this.isSaving() || this.isCopying() || this.isDeleting();
+            });
 			this.defaultName = globalConstants.newEntityNames.plp;
 			this.componentParams = ko.observable({
 				analysisId: sharedState.predictionAnalysis.selectedId,

js/pages/profiles/profile-manager.js

@@ -80,6 +80,7 @@ define([
 				} else if (this.cohortDefinitionId()) {
 					cohortDefinitionService.getCohortDefinition(this.cohortDefinitionId())
 						.then((cohortDefinition) => {
+							cohortDefinition.expression = JSON.parse(cohortDefinition.expression);
 							this.currentCohortDefinition(new CohortDefinition(cohortDefinition));
 						});
 				}

js/services/IRAnalysis.js

@@ -43,7 +43,7 @@ define(function (require, exports) {
 	}
 
 	function saveAnalysis(definition) {
-		var definitionCopy = JSON.parse(ko.toJSON(definition));
+		var definitionCopy = JSON.parse(ko.toJSON(definition))
 
 		if (typeof definitionCopy.expression != 'string')
 			definitionCopy.expression = JSON.stringify(definitionCopy.expression);
@@ -105,7 +105,7 @@ define(function (require, exports) {
 			});
 	}
 
-	const errorHandler = response => {
+	const errroHandler = response => {
 		if (response.status === 404) {
 			throw new Error("Not found entity");
 		}
@@ -118,15 +118,15 @@ define(function (require, exports) {
 
 		return promise
 			.then(({ data }) => data)
-			.catch(errorHandler);
+			.catch(errroHandler);
 	}
 
 	function loadResultsSummary(id, sourceKey) {
 		const promise = httpService.doGet(`${config.webAPIRoot}ir/${id}/info/${sourceKey}`);
 
 		return promise
 			.then(({data}) => data)
-			.catch(errorHandler);
+			.catch(errroHandler);
 	}
 
 	function deleteInfo(id, sourceKey) {
@@ -148,7 +148,7 @@ define(function (require, exports) {
 				authApi.handleAccessDenied(response);
 				return response;
 			});
-	}
+	}	
 
 	function exists(name, id) {
 		return httpService
@@ -173,7 +173,7 @@ define(function (require, exports) {
 		getReport: getReport,
 		loadResultsSummary,
 		exists,
-	};
+	}
 
 	return api;
 });