Merge branch...

Merge branch '52-fix-users-view-when-user-has-both-system-admin-and-domain-admin-role' of https://github.com/nmaas-platform/nmaas-portal into 52-fix-users-view-when-user-has-both-system-admin-and-domain-admin-role

.github/workflows/github-ci-sonar.yml

+name: Run tests and Sonar update
+
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  run-sonar:
+    runs-on: ubuntu-22.04
+
+    container:
+      image: docker://trion/ng-cli-karma:14.2.1
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set execute permissions for gradlew
+        run: chmod +x ./gradlew
+
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: '11'
+
+      - name: Install dependencies
+        run: npm ci --force
+
+      - name: Check test coverage
+        run: ./gradlew testCoverage
+
+      - name: Run Sonar update
+        env:
+          SONAR_LOGIN_TOKEN: ${{ secrets.SONAR_LOGIN_TOKEN }}
+          SONAR_HOST: ${{ vars.SONAR_HOST }}
+          SONAR_PROJECT_KEY: ${{ vars.SONAR_PROJECT_KEY }}
+          SONAR_PROJECT_NAME: ${{ vars.SONAR_PROJECT_NAME }}
+          SONAR_BRANCH: ${{ github.ref_name }}
+        run: ./gradlew -Dsonar.host.url=${SONAR_HOST} -Dsonar.projectKey=${SONAR_PROJECT_KEY} -Dsonar.projectName=${SONAR_PROJECT_NAME} -Dsonar.branch.name=${SONAR_BRANCH} -Dsonar.login=${SONAR_LOGIN_TOKEN} sonarqube

build.gradle

@@ -5,7 +5,7 @@ plugins {
 	id "org.sonarqube" version "3.2.0"
 }
 
-version = '1.5.3'
+version = '1.6.0-SNAPSHOT'
 
 task buildGUI(type: Exec) {
 	println 'Building using Angular CLI'
@@ -52,7 +52,6 @@ task testCoverage(type: Exec) {
 		commandLine 'ng', 'test', '--browsers', 'Chromium', '--watch=false', '--code-coverage', '--source-map=false'
 	}
 
-	dependsOn(npm_install)
 }
 
 sonarqube {

readme.md

 # NMaaS Portal (GUI)
 
-### Web-based GUI for browsing, subscription and deployment of network management applications offered by the NMaaS system
+### Web-based GUI for browsing, subscription and deployment of applications offered by the NMaaS Platform
 
 ### Technologies
 ---

src/app/appmarket/bulkDeployment/bulk-view/bulk-view.component.html

@@ -194,7 +194,7 @@
 
                 <table class="table table-hover table-condensed" aria-describedby="Domains in Group table">
                     <thead>
-                    <tr>
+                    <tr #column>
                         <th>{{'BULK.LIST.STATE' | translate}}</th>
                         <th>{{'BULK.APP.INSTANCE_ID' | translate}}</th>
                         <th>{{'BULK.APP.INSTANCE_NAME' | translate}}</th>