Merge pull request #91 from com-pas/github-actions-update

Small fixes and update of the Github Actions.

Author: Rob Tjalma

.github/dependabot.yml

@@ -0,0 +1,13 @@
+# SPDX-FileCopyrightText: 2021 Alliander N.V.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+version: 2
+
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 5

.github/workflows/build-project.yml

@@ -1,6 +1,13 @@
 name: Build Project
 
-on: push
+on:
+  push:
+    branches:
+      - '**'
+      - '!main'
+  pull_request:
+    branches:
+      - 'main'
 
 jobs:
   build:
@@ -9,16 +16,38 @@ jobs:
     timeout-minutes: 15
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        id: buildx
+        if: ${{ github.event_name == 'pull_request' }}
+        uses: docker/setup-buildx-action@v1
+      - name: Cache Docker Register
+        if: ${{ github.event_name == 'pull_request' }}
+        uses: actions/cache@v2
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }}
+
       - name: Use Node.js 14.x
         uses: actions/setup-node@v1
         with:
           node-version: '14.x'
+
+      - name: Test application with npm
+        if: ${{ github.event_name == 'push' }}
+        run: |
+          npm ci
+          npm run-script test
+
       - name: Build application with npm
+        if: ${{ github.event_name == 'pull_request' }}
         run: |
           npm ci
           npm run-script build
       - name: Build docker image
+        if: ${{ github.event_name == 'pull_request' }}
         uses: docker/build-push-action@v2
         with:
           # Set the context to use the current directory and not execute it's own git checkout.

.github/workflows/release-project.yml

@@ -13,8 +13,23 @@ jobs:
     name: Build and publish
     runs-on: ubuntu-latest
     steps:
-      - name: Check out the repo
+      - name: Checkout
         uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+      - name: Cache Docker Register
+        uses: actions/cache@v2
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }}
+
       - name: Extract tag name
         id: extract_tagname
         shell: bash
@@ -24,15 +39,11 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: '14.x'
+
       - name: Build application with npm
         run: |
           npm ci
           npm run-script build
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_TOKEN }}
       - name: Build and push docker image to Docker Hub
         uses: docker/build-push-action@v2
         with:

__snapshots__/compas-scltype-list.md

@@ -41,14 +41,7 @@
     tabindex="0"
   >
     <span>
-      <description>
-        System Exchange Description
-      </description>
-      (
-      <code>
-        SED
-      </code>
-      )
+      System Exchange Description (SED)
     </span>
   </mwc-list-item>
   <mwc-list-item
@@ -57,14 +50,7 @@
     tabindex="-1"
   >
     <span>
-      <description>
-        Substation Specification Description
-      </description>
-      (
-      <code>
-        SSD
-      </code>
-      )
+      Substation Specification Description (SSD)
     </span>
   </mwc-list-item>
 </mwc-list>

__snapshots__/compas-scltype-radiogroup.md

@@ -44,10 +44,7 @@
     value="SED"
   >
     <span>
-      <description>
-        System Exchange Description
-      </description>
-      (SED)
+      System Exchange Description (SED)
     </span>
   </mwc-radio-list-item>
   <mwc-radio-list-item
@@ -59,10 +56,7 @@
     value="SSD"
   >
     <span>
-      <description>
-        Substation Specification Description
-      </description>
-      (SSD)
+      Substation Specification Description (SSD)
     </span>
   </mwc-radio-list-item>
 </mwc-list>

src/compas-editors/CompasVersions.ts

@@ -132,7 +132,7 @@ export default class CompasVersionsPlugin extends LitElement {
       `
     }
 
-    if (this.scls?.length <= 0) {
+    if (this.scls.length <= 0) {
       return html `
         <mwc-list>
           <mwc-list-item>

src/compas-services/foundation.ts

@@ -60,8 +60,8 @@ export function parseXml(textContent: string): Promise<Document> {
 
 export function extractSclFromResponse(response: Document): Promise<Document> {
   // Extract the SCL Result from the Response and create a new Document from it.
-  const sclData = response.querySelectorAll("SclData").item(0).textContent;
-  const sclDocument = new DOMParser().parseFromString(sclData??'', 'application/xml');
+  const sclData = response.querySelectorAll("SclData").item(0).textContent ?? '';
+  const sclDocument = new DOMParser().parseFromString(sclData, 'application/xml');
   return Promise.resolve(sclDocument);
 }
 

src/compas/CompasSclTypeList.ts

@@ -49,10 +49,10 @@ export class CompasSclTypeList extends LitElement {
       return html`
         <mwc-list>
           ${this.sclTypes.map( type => {
-              const code = type.getElementsByTagNameNS(SDS_NAMESPACE, "Code").item(0);
-              const description = type.getElementsByTagNameNS(SDS_NAMESPACE, "Description").item(0);
+              const code = type.getElementsByTagNameNS(SDS_NAMESPACE, "Code").item(0)!.textContent ?? '';
+              const description = type.getElementsByTagNameNS(SDS_NAMESPACE, "Description").item(0)!.textContent ?? '';
               return html`<mwc-list-item tabindex="0"
-                                         @click=${() => this.dispatchEvent(newTypeSelectedEvent(code!.textContent ?? ''))}>
+                                         @click=${() => this.dispatchEvent(newTypeSelectedEvent(code))}>
                             <span>${description} (${code})</span>
                           </mwc-list-item>`;
             })}

src/compas/CompasSclTypeRadiogroup.ts

@@ -54,8 +54,8 @@ export class CompasSclTypeRadiogroup extends LitElement {
       <mwc-list activatable>
         ${this.sclTypes.map( type => {
           const code = type.getElementsByTagNameNS(SDS_NAMESPACE, "Code").item(0)!.textContent ?? '';
-          const description = type.getElementsByTagNameNS(SDS_NAMESPACE, "Description").item(0);
-          return html`<mwc-radio-list-item value="${code ?? ''}" ?selected="${(code === this.value)}" left>
+          const description = type.getElementsByTagNameNS(SDS_NAMESPACE, "Description").item(0)!.textContent ?? '';
+          return html`<mwc-radio-list-item value="${code}" ?selected="${(code === this.value)}" left>
                               <span>${description} (${code})</span>
                       </mwc-radio-list-item>`;
         })}