diff --git a/.github/workflows/github-ci-sonar.yml b/.github/workflows/github-ci-sonar.yml new file mode 100644 index 0000000000000000000000000000000000000000..4be1e09f3b6884a0d3d5ee10b7bee9ad1d81338f --- /dev/null +++ b/.github/workflows/github-ci-sonar.yml @@ -0,0 +1,40 @@ +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 diff --git a/build.gradle b/build.gradle index 97f6faa619bc9f22c75c89f3a57e077adc9f05f9..cfdad9f0bc1bed1bd14dfb8996e60fa339709aef 100644 --- a/build.gradle +++ b/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 { diff --git a/readme.md b/readme.md index ac3f3a14e8f7d17ffef2bb49b0734c9d76b416b0..0d7c42c8c9afe9753af6707dc883ef3159ea2153 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@ # 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 --- diff --git a/src/app/appmarket/bulkDeployment/bulk-view/bulk-view.component.html b/src/app/appmarket/bulkDeployment/bulk-view/bulk-view.component.html index fccc7db77b72de2a284c3592881a2e40f4228e43..5f67c89c1968d6ea0d9106aee5241c4d638f2594 100644 --- a/src/app/appmarket/bulkDeployment/bulk-view/bulk-view.component.html +++ b/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>