Merge branch 'release/6.6.0'

MauroDataMapper · Sep 2, 2021 · 393efdb · 393efdb
2 parents cc13ab4 + 682e28f
commit 393efdb
Show file tree

Hide file tree

Showing 26 changed files with 363 additions and 239 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -74,13 +74,74 @@ pipeline {
           }
         }
       }
-      post{
-        always{
-          recordIssues tools: [esLint(pattern: '**/eslint_report.xml')]
+      post {
+        always {
+          recordIssues qualityGates: [[threshold: 1, type: 'TOTAL', unstable: true]], tools: [esLint(pattern: '**/eslint_report.xml')]
+        }
+      }
+    }
+
+    stage('Distribution Build') {
+      steps {
+        nvm('') {
+          catchError(buildResult: 'UNSTABLE', stageResult: 'UNSTABLE') {
+            sh 'npm run dist'
+          }
         }
       }
     }
 
+    // Deploy develop branch even if tests fail if the code builds, as it'll be an unstable snapshot but we should still deploy
+    stage('Deploy develop to Artifactory') {
+      when {
+        branch 'develop'
+      }
+      steps {
+        rtUpload(
+          serverId: 'cs-artifactory',
+          spec: '''{
+          "files": [
+            {
+              "pattern": "dist/mdm-ui-*.tgz",
+              "target": "artifacts-snapshots/mauroDataMapper/mdm-ui/"
+            }
+         ]
+    }''',
+          )
+        rtPublishBuildInfo(
+          serverId: 'cs-artifactory',
+          )
+      }
+    }
+
+    stage('Deploy main to Artifactory') {
+      when {
+        allOf {
+          branch 'main'
+          expression {
+            currentBuild.currentResult == 'SUCCESS'
+          }
+        }
+
+      }
+      steps {
+        rtUpload(
+          serverId: 'cs-artifactory',
+          spec: '''{
+          "files": [
+            {
+              "pattern": "dist/mdm-ui-*.tgz",
+              "target": "artifacts/mauroDataMapper/mdm-ui/"
+            }
+         ]
+    }''',
+          )
+        rtPublishBuildInfo(
+          serverId: 'cs-artifactory',
+          )
+      }
+    }
+
     stage('Sonarqube') {
       when {
         branch 'develop'
@@ -95,6 +156,28 @@ pipeline {
         }
       }
     }
+
+    stage('Continuous Deployment') {
+      when {
+        allOf {
+          branch 'develop'
+          expression {
+            currentBuild.currentResult == 'SUCCESS'
+          }
+        }
+      }
+      steps {
+        script {
+          try {
+            println("Triggering the [continuous-deployment] job")
+            build quietPeriod: 300, wait: false, job: 'continuous-deployment'
+          } catch (hudson.AbortException ignored) {
+            println("Cannot trigger the [continuous-deployment] job as it doesn't exist")
+          }
+        }
+      }
+    }
+
   }
   post {
     always {
@@ -108,7 +191,6 @@ pipeline {
         reportTitles         : 'Test'
       ])
       outputTestResults()
-      slackNotification()
       zulipNotification(topic: 'mdm-ui')
     }
   }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mdm-ui",
-  "version": "6.5.0",
+  "version": "6.6.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -12,8 +12,8 @@
     "test-watch": "jest --watch",
     "test-clearCache": "jest --clearCache",
     "lint": "ng lint",
-    "eslint": "tsc --noEmit && eslint . --ext ts --quiet --fix",
-    "eslint-nofix": "tsc --noEmit && eslint . --ext ts --quiet",
+    "eslint": "tsc --noEmit && eslint . --ext ts --fix",
+    "eslint-nofix": "tsc --noEmit && eslint . --ext ts",
     "eslint-report": "eslint . --ext ts --format checkstyle -o eslint_report.xml",
     "e2e": "ng e2e",
     "postinstall": "ngcc",
@@ -38,7 +38,7 @@
     "@bpmn-io/dmn-migrate": "^0.4.3",
     "@ctrl/ngx-codemirror": "4.0.1",
     "@fortawesome/fontawesome-free": "5.15.1",
-    "@maurodatamapper/mdm-resources": "git+https://github.com/MauroDataMapper/mdm-resources.git#4.9.0",
+    "@maurodatamapper/mdm-resources": "git+https://github.com/MauroDataMapper/mdm-resources.git#4.10.0",
     "@uirouter/angular": "7.0.0",
     "@uirouter/core": "6.0.6",
     "@uirouter/rx": "0.6.5",

diff --git a/src/app/admin/api-property/api-property.component.ts b/src/app/admin/api-property/api-property.component.ts
@@ -87,76 +87,6 @@ export class ApiPropertyComponent implements OnInit {
     }
   }
 
-  private createFormGroup() {
-    this.formGroup = new FormGroup({
-      key: new FormControl(this.property.metadata.key, [Validators.required]),  // eslint-disable-line @typescript-eslint/unbound-method
-      category: new FormControl(this.property.metadata.category, [Validators.required]),  // eslint-disable-line @typescript-eslint/unbound-method
-      publiclyVisible: new FormControl({ value: this.property.metadata.publiclyVisible, disabled: this.property.metadata.isSystem }),
-      value: new FormControl(this.property.original?.value, [Validators.required])  // eslint-disable-line @typescript-eslint/unbound-method
-    });
-  }
-
-  private getBlankMetadata() {
-    return {
-      key: '',
-      category: '',
-      publiclyVisible: false,
-      editType: ApiPropertyEditType.Value,
-      isSystem: false
-    };
-  }
-
-  private loadExistingProperty() {
-    this.resources.apiProperties
-      .get(this.id)
-      .pipe(
-        map((response: ApiPropertyResponse): ApiPropertyEditableState => {
-          const original = response.body;
-          const metadata = propertyMetadata.find(p => p.key === original.key) ?? {
-            key: original.key,
-            category: original.category,
-            isSystem: false,
-            publiclyVisible: original.publiclyVisible,
-            editType: ApiPropertyEditType.Value
-          };
-
-          return {
-            metadata,
-            original
-          };
-        }),
-        catchError(errors => {
-          this.messageHandler.showError('There was a problem getting the property.', errors);
-          return [];
-        })
-      )
-      .subscribe((data: ApiPropertyEditableState) => {
-        this.property = data;
-        this.createFormGroup();
-      });
-  }
-
-  private loadAvailableSystemProperties() {
-    this.resources.apiProperties
-      .list()
-      .pipe(
-        map((response: ApiPropertyIndexResponse) => {
-          return response.body.items;
-        }),
-        catchError(errors => {
-          this.messageHandler.showError('There was a problem getting the properties.', errors);
-          return [];
-        })
-      )
-      .subscribe((data: ApiProperty[]) => {
-        this.systemProperties = propertyMetadata.filter(m => data.every(p => p.key !== m.key));
-        this.property = {
-          metadata: this.getBlankMetadata()
-        };
-        this.createFormGroup();
-      });
-  }
-
   systemPropertyChanged(change: MatSelectChange) {
     if (change.value) {
       this.property.metadata = propertyMetadata.find(m => m.key === change.value);
@@ -243,6 +173,76 @@ export class ApiPropertyComponent implements OnInit {
     }
   }
 
+  private createFormGroup() {
+    this.formGroup = new FormGroup({
+      key: new FormControl(this.property.metadata.key, [Validators.required]),  // eslint-disable-line @typescript-eslint/unbound-method
+      category: new FormControl(this.property.metadata.category, [Validators.required]),  // eslint-disable-line @typescript-eslint/unbound-method
+      publiclyVisible: new FormControl({ value: this.property.metadata.publiclyVisible, disabled: this.property.metadata.isSystem }),
+      value: new FormControl(this.property.original?.value, [Validators.required])  // eslint-disable-line @typescript-eslint/unbound-method
+    });
+  }
+
+  private getBlankMetadata() {
+    return {
+      key: '',
+      category: '',
+      publiclyVisible: false,
+      editType: ApiPropertyEditType.Value,
+      isSystem: false
+    };
+  }
+
+  private loadExistingProperty() {
+    this.resources.apiProperties
+      .get(this.id)
+      .pipe(
+        map((response: ApiPropertyResponse): ApiPropertyEditableState => {
+          const original = response.body;
+          const metadata = propertyMetadata.find(p => p.key === original.key) ?? {
+            key: original.key,
+            category: original.category,
+            isSystem: false,
+            publiclyVisible: original.publiclyVisible,
+            editType: ApiPropertyEditType.Value
+          };
+
+          return {
+            metadata,
+            original
+          };
+        }),
+        catchError(errors => {
+          this.messageHandler.showError('There was a problem getting the property.', errors);
+          return [];
+        })
+      )
+      .subscribe((data: ApiPropertyEditableState) => {
+        this.property = data;
+        this.createFormGroup();
+      });
+  }
+
+  private loadAvailableSystemProperties() {
+    this.resources.apiProperties
+      .list()
+      .pipe(
+        map((response: ApiPropertyIndexResponse) => {
+          return response.body.items;
+        }),
+        catchError(errors => {
+          this.messageHandler.showError('There was a problem getting the properties.', errors);
+          return [];
+        })
+      )
+      .subscribe((data: ApiProperty[]) => {
+        this.systemProperties = propertyMetadata.filter(m => data.every(p => p.key !== m.key));
+        this.property = {
+          metadata: this.getBlankMetadata()
+        };
+        this.createFormGroup();
+      });
+  }
+
   private navigateToParent() {
     this.editing.stop();
     this.stateHandler.Go(

diff --git a/src/app/admin/openid-connect-provider-table/openid-connect-provider-table.component.ts b/src/app/admin/openid-connect-provider-table/openid-connect-provider-table.component.ts
@@ -22,7 +22,7 @@ import { MatSort, SortDirection } from '@angular/material/sort';
 import { MatTableDataSource } from '@angular/material/table';
 import { Title } from '@angular/platform-browser';
 import { ModulesResponse, OpenIdConnectProvider, OpenIdConnectProvidersIndexResponse } from '@maurodatamapper/mdm-resources';
-import { OpenIdConnectModuleName } from '@mdm/model/openid-connect.model';
+import { openIdConnectModuleName } from '@mdm/model/openid-connect.model';
 import { MdmResourcesService } from '@mdm/modules/resources';
 import { GridService, MessageHandlerService, SharedService, StateHandlerService } from '@mdm/services';
 import { MdmPaginatorComponent } from '@mdm/shared/mdm-paginator/mdm-paginator';
@@ -78,7 +78,7 @@ export class OpenidConnectProviderTableComponent implements OnInit, AfterViewIni
         finalize(() => this.loading = false)
       )
       .subscribe((response: ModulesResponse) => {
-        this.moduleLoaded = response.body.findIndex(module => module.name === OpenIdConnectModuleName) !== -1;
+        this.moduleLoaded = response.body.findIndex(module => module.name === openIdConnectModuleName) !== -1;
         if (this.moduleLoaded) {
           this.initialise();
         }

diff --git a/src/app/admin/subscribed-catalogue/subscribed-catalogue.component.ts b/src/app/admin/subscribed-catalogue/subscribed-catalogue.component.ts
@@ -118,11 +118,6 @@ export class SubscribedCatalogueComponent implements OnInit {
     });
   }
 
-  private navigateToParent() {
-    this.editingService.stop();
-    this.stateHandler.Go('appContainer.adminArea.subscribedCatalogues');
-  }
-
   validate() {
     let isValid = true;
     this.errors = {};
@@ -144,4 +139,9 @@ export class SubscribedCatalogueComponent implements OnInit {
 
     return isValid;
   }
+
+  private navigateToParent() {
+    this.editingService.stop();
+    this.stateHandler.Go('appContainer.adminArea.subscribedCatalogues');
+  }
 }