Update dependency core-js to v3.25.4 (#475 )

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Change roles in user editor (#478 )
2025-12-06 07:12:46 +01:00 · 2022-10-02 23:45:08 +02:00 · 2022-10-02 23:45:00 +02:00 · 2022-10-02 23:36:34 +02:00 · 2022-10-02 23:18:12 +02:00 · 2022-10-02 20:10:57 +02:00
8 changed files with 38 additions and 109 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,25 +13,9 @@ jobs:
    name: Lint
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/setup-go@v3
-        with: { go-version: '1.18' }
-
-      - id: goenv
-        run: |
-          echo "::set-output name=gocache::$(go env GOCACHE)"
-          echo "::set-output name=gomodcache::$(go env GOMODCACHE)"
-
      - uses: actions/checkout@v3
-
-      - uses: actions/cache@v3
-        with:
-          path: ${{ steps.goenv.outputs.gocache }}
-          key: ${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }}
-      - uses: actions/cache@v3
-        with:
-          path: ${{ steps.goenv.outputs.gomodcache }}
-          key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}
-
+      - uses: actions/setup-go@v3
+        with: { go-version: '1.19', cache: true }
      - run: |
          mkdir -p ui/dist/img
          touch ui/dist/index.html ui/dist/favicon.ico ui/dist/manifest.json ui/dist/img/fake.png
@@ -40,29 +24,12 @@ jobs:
  test:
    name: Test
    runs-on: ubuntu-latest
-    env: { GIN_MODE: test }
    steps:
-      - uses: actions/setup-go@v3
-        with: { go-version: '1.18' }
-      - uses: actions/setup-node@v3
-        with: { node-version: '14' }
-
-      - id: goenv
-        run: |
-          echo "::set-output name=gocache::$(go env GOCACHE)"
-          echo "::set-output name=gomodcache::$(go env GOMODCACHE)"
-
      - uses: actions/checkout@v3
-
-      - uses: actions/cache@v3
-        with:
-          path: ${{ steps.goenv.outputs.gocache }}
-          key: ${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }}
-      - uses: actions/cache@v3
-        with:
-          path: ${{ steps.goenv.outputs.gomodcache }}
-          key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}
-
+      - uses: actions/setup-node@v3
+        with: { node-version: '14', cache: 'yarn', cache-dependency-path: 'ui/yarn.lock' }
+      - uses: actions/setup-go@v3
+        with: { go-version: '1.19', cache: true }
      - run: |
          mkdir -p ui/dist/img
          touch ui/dist/index.html ui/dist/favicon.ico ui/dist/manifest.json ui/dist/img/fake.png
@@ -85,46 +52,29 @@ jobs:
        auth: [ keycloak ] # simple
    runs-on: ubuntu-latest
    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v3
      - uses: actions/setup-go@v3
        with: { go-version: '1.18' }
      - uses: actions/setup-node@v3
        with: { node-version: '14' }
-
      # run UI
      - run: |
          yarn install
          yarn serve &
        working-directory: ui
-      - run: go install github.com/cugu/wait_for_response@latest
-      - name: Wait for frontend
-        uses: cugu/wait_for_response@v1.13.0
-        with:
-          url: 'http://localhost:8080'
-          responseCode: 200
-
+      - run: curl --head -X GET --retry 60 --retry-connrefused --retry-delay 10 http://localhost:8080
      # run containers
      - run: | 
          sed -i 's/host.docker.internal/172.17.0.1/g' dev/nginx.conf
          sed -i 's/host.docker.internal/172.17.0.1/g' dev/nginx-with-keycloak.conf
-
      - run: docker compose up --quiet-pull --detach
        working-directory: dev
        if: matrix.auth == 'simple'
      - run: docker compose -f docker-compose-with-keycloak.yml up --quiet-pull --detach
        working-directory: dev
        if: matrix.auth == 'keycloak'
-      - name: Wait for keycloak
-        uses: cugu/wait_for_response@v1.13.0
-        with:
-          url: 'http://localhost:9002/auth/realms/catalyst'
-          responseCode: 200
-          verbose: true
-          timeout: 3m
-          interval: 10s
+      - run: curl --head -X GET --retry 60 --retry-connrefused --retry-delay 10 http://localhost:9002/auth/realms/catalyst
        if: matrix.auth == 'keycloak'
-
      # run catalyst
      - run: |
          mkdir -p ui/dist/img
@@ -136,16 +86,7 @@ jobs:
      - run: bash start_dev_with_keycloak.sh &
        working-directory: dev
        if: matrix.auth == 'keycloak'
-      - name: Wait for catalyst
-        uses: cugu/wait_for_response@v1.13.0
-        with:
-          url: 'http://localhost:8000'
-          method: GET
-          responseCode: 302
-          verbose: true
-          timeout: 3m
-          interval: 10s
-
+      - run: curl --head -X GET --retry 60 --retry-connrefused --retry-delay 10 http://localhost:8000
      # run cypress
      - uses: cypress-io/github-action@v4
        env:
@@ -165,15 +106,9 @@ jobs:
    name: Build npm
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/setup-node@v3
-        with: { node-version: '14' }
      - uses: actions/checkout@v3
-
-      - uses: actions/cache@v3
-        with:
-          path: '**/node_modules'
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
-
+      - uses: actions/setup-node@v3
+        with: { node-version: '14', cache: 'yarn', cache-dependency-path: 'ui/yarn.lock' }
      - run: yarn install && yarn build
        working-directory: ui
      - uses: actions/upload-artifact@v3
@@ -185,38 +120,22 @@ jobs:
    runs-on: ubuntu-latest
    needs: [ build-npm, test ]
    steps:
-      - uses: actions/setup-go@v3
-        with: { go-version: '1.18' }
-
-      - id: goenv
-        run: |
-          echo "::set-output name=gocache::$(go env GOCACHE)"
-          echo "::set-output name=gomodcache::$(go env GOMODCACHE)"
-
      - uses: actions/checkout@v3
-
-      - uses: actions/cache@v3
-        with:
-          path: ${{ steps.goenv.outputs.gocache }}
-          key: ${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }}
-      - uses: actions/cache@v3
-        with:
-          path: ${{ steps.goenv.outputs.gomodcache }}
-          key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}
-
+      - uses: actions/setup-go@v3
+        with: { go-version: '1.19', cache: true }
      - uses: actions/download-artifact@v3
        with: { name: ui, path: ui/dist }
+      - name: Version
+        if: github.ref_type == 'tag' && github.ref_name != ''
+        run: |
+          echo ${{ github.ref_name }}
+          echo ${{ github.ref_name }} > VERSION
      - run: go build -o catalyst ./cmd/catalyst/.
      - uses: docker/login-action@v2
        with:
          registry: ${{ env.REGISTRY }}
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Version
-        if: github.ref_type == 'tag' && github.ref_name != ''
-        run: |
-          echo ${{ github.ref_name }}
-          echo ${{ github.ref_name }} > VERSION
      - name: Extract metadata (tags, labels) for Docker
        id: meta
        uses: docker/metadata-action@v4
--- a/README.md
+++ b/README.md
@@ -72,12 +72,17 @@ Automations are scripts that automate tasks or enrich artifacts. Automations are
 run in their own Docker containers. This enables them to be created in different
 scripting languages and run securely in their own environment.

-### Users
+### Dashboards

 <center>
-  <img alt="Screenshot of the playbook part of a ticket" src="docs/screenshots/roles.png" />
+  <img alt="Screenshot of the dashboard editor" src="docs/screenshots/dashboard.png" />
 </center>

+Catalyst comes with a dashboard editor that allows you to create custom dashboards
+for your organisation. Dashboards can be created with line, bar, and pie charts.
+
+### Users
+
 Catalyst has two different types of users, normal users accessing the platform
 via OIDC authentication and API keys for external script. A
 fine-grained access model is available for both types and allows to define
--- a/docs/screenshots/dashboard.png
+++ b/docs/screenshots/dashboard.png
--- a/docs/screenshots/user.png
+++ b/docs/screenshots/user.png
--- a/ui/package.json
+++ b/ui/package.json
@@ -22,7 +22,7 @@
    "antlr4": "4.11.0",
    "axios": "0.21.4",
    "chart.js": "2.9.4",
-    "core-js": "3.25.3",
+    "core-js": "3.25.4",
    "graphlib": "2.1.8",
    "json-schema-editor-vue": "2.1.0",
    "just-kebab-case": "4.1.1",
--- a/ui/src/App.vue
+++ b/ui/src/App.vue
@@ -111,7 +111,7 @@
            <v-list-item class="version" dense style="min-height: 20px">
              <v-list-item-content>
                <v-list-item-title style="text-align: center; opacity: 0.5;">
-                  {{ $store.state.settings.tier }} v{{ $store.state.settings.version }}
+                  {{ $store.state.settings.version }}
                </v-list-item-title>
              </v-list-item-content>
            </v-list-item>
--- a/ui/src/views/User.vue
+++ b/ui/src/views/User.vue
@@ -39,7 +39,7 @@
                v => !!v || 'Password is required',
                v => (v && v.length >= 8) || 'Password must be at least 8 characters',
              ]"></v-text-field>
-          <v-select multiple chips label="Roles" v-model="user.roles" :items="$store.state.settings.roles"></v-select>
+          <v-select multiple chips label="Roles" v-model="user.roles" :items="['analyst', 'engineer', 'admin']"></v-select>
          <v-btn @click="save" color="success" outlined>
            <v-icon>mdi-plus-thick</v-icon>
            Create
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -4368,16 +4368,21 @@ core-js-pure@^3.25.1:
  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.25.3.tgz#66ac5bfa5754b47fdfd14f3841c5ed21c46db608"
  integrity sha512-T/7qvgv70MEvRkZ8p6BasLZmOVYKzOaWNBEHAU8FmveCJkl4nko2quqPQOmy6AJIp5MBanhz9no3A94NoRb0XA==

-core-js@3.25.3, core-js@^3.6.5:
-  version "3.25.3"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.25.3.tgz#cbc2be50b5ddfa7981837bd8c41639f27b166593"
-  integrity sha512-y1hvKXmPHvm5B7w4ln1S4uc9eV/O5+iFExSRUimnvIph11uaizFR8LFMdONN8hG3P2pipUfX4Y/fR8rAEtcHcQ==
+core-js@3.25.4:
+  version "3.25.4"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.25.4.tgz#76f6bc330a79aafbaf77e9645293351ea5d09b5b"
+  integrity sha512-JDLxg61lFPFYQ7U0HKoyKwVUV63VbbVTb/K73Yf+k4Mf4ZBZxCjfyrWZjTk1ZM7ZrgFSqhSIOmuzYAxG2f/reQ==

 core-js@^2.4.0:
  version "2.6.12"
  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==

+core-js@^3.6.5:
+  version "3.25.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.25.3.tgz#cbc2be50b5ddfa7981837bd8c41639f27b166593"
+  integrity sha512-y1hvKXmPHvm5B7w4ln1S4uc9eV/O5+iFExSRUimnvIph11uaizFR8LFMdONN8hG3P2pipUfX4Y/fR8rAEtcHcQ==
+
 core-util-is@1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
Author	SHA1	Message	Date
renovate[bot]	8f804305cd	Update dependency core-js to v3.25.4 (#475 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2022-10-02 23:45:08 +02:00
Jonas Plum	2626d156bc	Change roles in user editor (#478 ) Co-authored-by: Jonas Plum <git@jonasplum.de>	2022-10-02 23:45:00 +02:00
Jonas Plum	b25f3f4708	Fix version info (#477 ) Co-authored-by: Jonas Plum <git@jonasplum.de>	2022-10-02 23:36:34 +02:00
Jonas Plum	5f4fd667a9	Update readme (#476 ) * Update readme Co-authored-by: Jonas Plum <git@jonasplum.de>	2022-10-02 23:18:12 +02:00
Jonas Plum	fc42d4043b	Fix version (#474 ) Co-authored-by: Jonas Plum <git@jonasplum.de>	2022-10-02 20:10:57 +02:00
Jonas Plum	e987e46cbd	Remove unneeded CI commands (#472 ) Co-authored-by: Jonas Plum <git@jonasplum.de>	2022-10-02 19:40:12 +02:00