Add classification banner 2

.github/workflows/main.yml

@@ -1,72 +1,23 @@
-name: Build
+name: Build and Publish Image
 
 on:
   pull_request:
     branches:
       - main
   push:
-    branches: [main]
+    branches:
+      - main
   release:
-    types: ['published']
-  workflow_dispatch:
-    inputs:
-      tagName:
-        description: 'Tag of the image you want to build and push'
-        required: true
+    types: ["published"]
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Prepare
-        id: prep
-        run: |
-          DOCKER_IMAGE=cmusei/player-ui
-          VERSION=development
-          if [[ ! -z "${{ github.event.inputs.tagName }}" ]]; then
-            VERSION=${{ github.event.inputs.tagName }}
-            TAGS="${DOCKER_IMAGE}:${VERSION}"
-          elif [[ $GITHUB_REF == refs/tags/* ]]; then
-            VERSION=${GITHUB_REF#refs/tags/}
-            MAJORMINORVERSION=$(echo $VERSION | grep -oP '(\d+)\.(\d+)')
-            TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:${MAJORMINORVERSION}"
-          elif [[ $GITHUB_REF == refs/heads/* ]]; then
-            VERSION=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g')
-            TAGS="${DOCKER_IMAGE}:${VERSION}"
-          fi
-          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            echo ::set-output name=push::false
-            echo "event is pull_request, not pushing image"
-          else
-            echo ::set-output name=push::true
-            echo "event is not pull_request, pushing image"
-          fi
-          echo ::set-output name=version::${VERSION}
-          echo ::set-output name=tags::${TAGS}
-          echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Login to DockerHub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          push: ${{ steps.prep.outputs.push }}
-          pull: true
-          tags: ${{ steps.prep.outputs.tags }}
-          labels: |
-            org.opencontainers.image.source=${{ github.event.repository.clone_url }}
-            org.opencontainers.image.created=${{ steps.prep.outputs.created }}
-            org.opencontainers.image.revision=${{ github.sha }}
+  build-and-publish:
+    name: Build and Publish
+    uses: cmu-sei/Crucible-Github-Actions/.github/workflows/docker-build.yaml@docker-v1
+    with:
+      imageName: cmusei/player-ui
+      versionMode: npm
+      versionFiles: package.json
+    secrets:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "player.ui",
-  "version": "3.1.1",
+  "version": "0.0.0",
   "license": "MIT",
   "scripts": {
     "ng": "ng",
@@ -37,7 +37,7 @@
     "@angular/platform-browser": "^21.2.1",
     "@angular/platform-browser-dynamic": "^21.2.1",
     "@angular/router": "^21.2.1",
-    "@cmusei/crucible-common": "^0.4.2",
+    "@cmusei/crucible-common": "^0.6.0",
     "@datorama/akita": "^8.0.1",
     "@datorama/akita-ng-router-store": "^8.0.0",
     "@material/material-color-utilities": "^0.4.0",

src/app/components/admin-app/admin-app-template-search/admin-template-details/admin-template-details.component.html

@@ -5,29 +5,29 @@
 
 <div class="d-flex flex-column">
   <mat-form-field>
+    <mat-label>Name</mat-label>
     <input
       matInput
-      placeholder="Name"
       tabIndex="1"
       name="name"
       [(ngModel)]="appTemplate.name"
       (change)="editAppTemplate()"
     />
   </mat-form-field>
   <mat-form-field>
+    <mat-label>URL</mat-label>
     <input
       matInput
-      placeholder="Url"
       tabIndex="2"
       name="url"
       [(ngModel)]="appTemplate.url"
       (change)="editAppTemplate()"
     />
   </mat-form-field>
   <mat-form-field>
+    <mat-label>Icon Path</mat-label>
     <input
       matInput
-      placeholder="icon"
       tabIndex="3"
       name="icon"
       [(ngModel)]="appTemplate.icon"

src/app/components/admin-app/admin-role-permission-search/create-permission-dialog/create-permission-dialog.component.html

@@ -7,6 +7,7 @@
   <h1 mat-dialog-title>{{ title }}</h1>
   <form (ngSubmit)="done()">
     <mat-form-field>
+      <mat-label>Name</mat-label>
       <input
         matInput
         placeholder="Name"
@@ -17,6 +18,7 @@ <h1 mat-dialog-title>{{ title }}</h1>
     ><br />
     ><br />
     <mat-form-field>
+      <mat-label>Description</mat-label>
       <input
         matInput
         placeholder="Description"

src/app/components/admin-app/admin-role-permission-search/create-role-dialog/create-role-dialog.component.html

@@ -7,6 +7,7 @@
   <h1 mat-dialog-title>{{ title }}</h1>
   <form (ngSubmit)="done()">
     <mat-form-field>
+      <mat-label>Name</mat-label>
       <input
         matInput
         placeholder="Name"