merged with production

EBI-Metabolights · Nov 18, 2023 · e255d23 · e255d23
1 parent b31bbe8
commit e255d23
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 26 deletions.
diff --git a/angular.json b/angular.json
@@ -52,11 +52,11 @@
                 }
               ]
             },
-            "development": {
+            "master": {
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.dev.ts"
+                  "with": "src/environments/environment.prod.ts"
                 }
               ],
               "optimization": true,
@@ -76,11 +76,11 @@
                 }
               ]
             },
-            "local": {
+            "development": {
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.local.ts"
+                  "with": "src/environments/environment.dev.ts"
                 }
               ],
               "optimization": true,
@@ -100,11 +100,11 @@
                 }
               ]
             },
-            "test": {
+            "local": {
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.test.ts"
+                  "with": "src/environments/environment.local.ts"
                 }
               ],
               "optimization": true,
@@ -124,11 +124,11 @@
                 }
               ]
             },
-            "staging": {
+            "test": {
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.staging.ts"
+                  "with": "src/environments/environment.test.ts"
                 }
               ],
               "optimization": true,
@@ -148,11 +148,11 @@
                 }
               ]
             },
-            "kubernetes": {
+            "staging": {
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.kubernetes.ts"
+                  "with": "src/environments/environment.staging.ts"
                 }
               ],
               "optimization": true,
@@ -186,14 +186,14 @@
             "development": {
               "browserTarget": "metabolights-editor:build:development"
             },
-            "kubernetes": {
-              "browserTarget": "metabolights-editor:build:kubernetes"
-            },
             "staging": {
               "browserTarget": "metabolights-editor:build:staging"
             },
             "test": {
               "browserTarget": "metabolights-editor:build:test"
+            },
+            "master": {
+              "browserTarget": "metabolights-editor:build:production"
             }
           }
         },

diff --git a/src/app/components/study/status/status.component.ts b/src/app/components/study/status/status.component.ts
@@ -110,20 +110,32 @@ export class StatusComponent implements OnInit {
   ngOnInit() {}
 
   openModal() {
-    if (!this.curator && this.status && this.status.toLowerCase() === "submitted") {
-      if (this.validation.status === 'error' || this.validation.status === 'not ready') {
-        toastr.error("Please validate your study and fix all errors before changing status.", "Error", {
-          timeOut: "5000",
-          positionClass: "toast-top-center",
-          preventDuplicates: true,
-          extendedTimeOut: 0,
-          tapToDismiss: false,
-        });
-      }
-      return;
+    if  (this.curator){
+      this.isModalOpen = true;
+    } else {
+      if (this.status != null && this.status.toLowerCase() === "submitted") {
+        if (this.validation.status === 'error' || this.validation.status === 'not ready') {
+          toastr.error("Please validate your study and fix all errors before changing status.", "Error", {
+            timeOut: "5000",
+            positionClass: "toast-top-center",
+            preventDuplicates: true,
+            extendedTimeOut: 0,
+            tapToDismiss: false,
+          });
+        } else {
+          this.isModalOpen = true;
+        }
+    } else {
+      toastr.error("You can not update your study status.", "Error", {
+        timeOut: "5000",
+        positionClass: "toast-top-center",
+        preventDuplicates: true,
+        extendedTimeOut: 0,
+        tapToDismiss: false,
+      });
     }
-    this.isModalOpen = true;
   }
+}
 
   closeModal() {
     this.isModalOpen = false;

diff --git a/src/environments/environment.kubernetes.ts → src/environments/environment.master.ts b/src/environments/environment.kubernetes.ts → src/environments/environment.master.ts
@@ -1,6 +1,6 @@
 export const environment = {
   production: true,
-  context: "kubernetes",
+  context: "production",
   isTesting: false,
   contextPath: "/metabolights/editor",
 };