From c250682264580ce83849cd2f218a3173cc578cca Mon Sep 17 00:00:00 2001 From: Rinat Arsaev <11846445+A77AY@users.noreply.github.com> Date: Tue, 12 May 2026 14:24:33 +0400 Subject: [PATCH 01/19] add publish --- .github/workflows/pr.yaml | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 1dae543b6..79e99c832 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -6,39 +6,23 @@ jobs: name: Check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: valitydev/action-frontend/setup-install@v2 - name: Check run: npm run check build: name: Build runs-on: ubuntu-latest - env: - SHORT_SHA: $(echo "${{ github.event.pull_request.head.sha }}" | cut -c1-7) steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: valitydev/action-frontend/setup-install@v2 with: npm-install-force: true - name: Build run: npm run build - # - name: Publish MatEz Library - # if: > - # contains(github.event.pull_request.labels.*.name, 'publish') - # || contains(github.event.pull_request.labels.*.name, 'publish matez') - # working-directory: ./dist/libs/matez - # run: > - # npm version prerelease --preid pr-${{ github.event.number }}-${{ env.SHORT_SHA }} --no-git-tag-version - # && npm publish --tag pr - # env: - # NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - # - name: Publish NgThrift Library - # if: > - # contains(github.event.pull_request.labels.*.name, 'publish') - # || contains(github.event.pull_request.labels.*.name, 'publish ng-thrift') - # working-directory: ./dist/libs/ng-thrift - # run: > - # npm version prerelease --preid pr-${{ github.event.number }}-${{ env.SHORT_SHA }} --no-git-tag-version - # && npm publish --tag pr - # env: - # NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + - name: Publish MatEz Library + uses: valitydev/action-frontend/publish@v2 + with: + directory: ./dist/libs/matez + npm-token: ${{ secrets.NPM_TOKEN }} + pr-label: 'matez' From c5c1a703d116cedf4132477b85b0664cdbd3899c Mon Sep 17 00:00:00 2001 From: Rinat Arsaev <11846445+A77AY@users.noreply.github.com> Date: Tue, 12 May 2026 14:55:25 +0400 Subject: [PATCH 02/19] fix for publish Co-authored-by: Copilot --- .github/workflows/main.yaml | 37 +++++-------------- .github/workflows/pr.yaml | 4 +- package-lock.json | 17 +++++---- projects/matez/package.json | 2 +- .../matez/src/lib/components/cmdk/index.ts | 1 + .../table/table-resource.component.ts | 4 +- .../utils/currency/get-currency-exponent.ts | 2 +- 7 files changed, 28 insertions(+), 39 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 7466c6b08..eccc518b8 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -7,7 +7,7 @@ jobs: name: Deploy runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: valitydev/action-frontend/setup-install@v2 - name: Build run: npm run build @@ -16,32 +16,15 @@ jobs: with: registry-username: ${{ github.actor }} registry-access-token: ${{ secrets.GITHUB_TOKEN }} - # - name: set config - # run: | - # printf "$APP_ENV_FILE" > dist/control-center/browser/assets/appConfig.json - # printf "$AUTH_ENV_FILE" > dist/control-center/browser/assets/authConfig.json - # env: - # APP_ENV_FILE: ${{secrets.APP_CONF}} - # AUTH_ENV_FILE: ${{secrets.AUTH_CONF}} - # - name: Publish to CF Pages - # uses: cloudflare/pages-action@1 - # with: - # apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} - # accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - # projectName: 'cc' - # directory: 'dist/control-center/browser' - # gitHubToken: ${{ secrets.GITHUB_TOKEN }} - # branch: main - # - name: Publish MatEz Library - # uses: valitydev/action-frontend/publish@v1.0 - # with: - # npm-token: ${{ secrets.NPM_TOKEN }} - # directory: ./dist/libs/matez - # - name: Publish NgThrift Library - # uses: valitydev/action-frontend/publish@v1.0 - # with: - # npm-token: ${{ secrets.NPM_TOKEN }} - # directory: ./dist/libs/ng-thrift + + - name: Build MatEz Library + run: npm run build -- matez + - name: Publish MatEz Library + uses: valitydev/action-frontend/publish@v2 + with: + directory: ./dist/matez + npm-token: ${{ secrets.NPM_TOKEN }} + pr-label: 'matez' notify: name: Notify runs-on: ubuntu-latest diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 79e99c832..c59163b27 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -20,9 +20,11 @@ jobs: npm-install-force: true - name: Build run: npm run build + - name: Build MatEz Library + run: npm run build -- matez - name: Publish MatEz Library uses: valitydev/action-frontend/publish@v2 with: - directory: ./dist/libs/matez + directory: ./dist/matez npm-token: ${{ secrets.NPM_TOKEN }} pr-label: 'matez' diff --git a/package-lock.json b/package-lock.json index 038b70c6c..13eb75ccd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1918,12 +1918,6 @@ "node": ">=14" } }, - "node_modules/@dinero.js/currencies": { - "version": "2.0.0-alpha.14", - "resolved": "https://registry.npmjs.org/@dinero.js/currencies/-/currencies-2.0.0-alpha.14.tgz", - "integrity": "sha512-Ck5ZLjRI7Pl7Y4VkeOst4WEwiN5vZezv8GHcXWsVLUfTNsmkV37VeLYDRAuTUP4akEJyIry+1o1qHYNtLq3eNw==", - "license": "MIT" - }, "node_modules/@emnapi/core": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.9.1.tgz", @@ -8551,6 +8545,15 @@ "dev": true, "license": "MIT" }, + "node_modules/dinero.js": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/dinero.js/-/dinero.js-2.0.2.tgz", + "integrity": "sha512-d+4egJTvNinkb66KSed11Daqz6MWaOHzyalLu6h3p+BLrsmwKFjHjvOKivOWeM7WyoX89te+xx4cKI6zrDtCfQ==", + "license": "MIT", + "engines": { + "node": ">=20.0.0" + } + }, "node_modules/doctrine": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", @@ -16563,12 +16566,12 @@ "name": "@vality/matez", "version": "21.0.0", "dependencies": { - "@dinero.js/currencies": "^2.0.0-alpha.14", "@ng-matero/extensions": "^21.1.4", "@s-libs/js-core": "^20.2.0", "@s-libs/micro-dash": "^20.0.0", "@s-libs/ng-core": "^20.2.0", "@s-libs/rxjs-core": "^20.2.0", + "dinero.js": "^2.0.0", "papaparse": "^5.5.3" }, "devDependencies": { diff --git a/projects/matez/package.json b/projects/matez/package.json index ba6f0b08e..fecc4b38b 100644 --- a/projects/matez/package.json +++ b/projects/matez/package.json @@ -24,12 +24,12 @@ "utility-types": "^3.11.0" }, "dependencies": { - "@dinero.js/currencies": "^2.0.0-alpha.14", "@ng-matero/extensions": "^21.1.4", "@s-libs/js-core": "^20.2.0", "@s-libs/micro-dash": "^20.0.0", "@s-libs/ng-core": "^20.2.0", "@s-libs/rxjs-core": "^20.2.0", + "dinero.js": "^2.0.0", "papaparse": "^5.5.3" }, "devDependencies": { diff --git a/projects/matez/src/lib/components/cmdk/index.ts b/projects/matez/src/lib/components/cmdk/index.ts index 94e638a04..fc813d7c3 100644 --- a/projects/matez/src/lib/components/cmdk/index.ts +++ b/projects/matez/src/lib/components/cmdk/index.ts @@ -3,3 +3,4 @@ export * from './types/cmdk-option'; export * from './types/cmdk-options'; export * from './cmdk.module'; export * from './cmdk.component'; +export * from './components/cmdk-button.component'; diff --git a/projects/matez/src/lib/components/table/table-resource.component.ts b/projects/matez/src/lib/components/table/table-resource.component.ts index 8f5f92ba5..971274288 100644 --- a/projects/matez/src/lib/components/table/table-resource.component.ts +++ b/projects/matez/src/lib/components/table/table-resource.component.ts @@ -1,8 +1,8 @@ import { Component, TemplateRef, booleanAttribute, computed, input, model } from '@angular/core'; -import { Column, ObservableResource, PagedObservableResource, UpdateOptions } from '@vality/matez'; - import { TableModule } from './table.module'; +import { ObservableResource, PagedObservableResource } from '../../utils'; +import { Column, UpdateOptions } from './types'; @Component({ selector: 'v-table-resource', diff --git a/projects/matez/src/lib/utils/currency/get-currency-exponent.ts b/projects/matez/src/lib/utils/currency/get-currency-exponent.ts index dd3360210..6d8730175 100644 --- a/projects/matez/src/lib/utils/currency/get-currency-exponent.ts +++ b/projects/matez/src/lib/utils/currency/get-currency-exponent.ts @@ -1,4 +1,4 @@ -import * as currencies from '@dinero.js/currencies'; +import * as currencies from 'dinero.js/currencies'; export const getCurrencyExponent = (currencyCode: string): number => currencies[currencyCode as keyof typeof currencies]?.exponent; From 1d39065a3e33ff436c99ab22cb0ec095b777affa Mon Sep 17 00:00:00 2001 From: Rinat Arsaev <11846445+A77AY@users.noreply.github.com> Date: Tue, 12 May 2026 15:03:12 +0400 Subject: [PATCH 03/19] fix --- projects/matez/ng-package.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/projects/matez/ng-package.json b/projects/matez/ng-package.json index 1be0a7a71..fc0d72622 100644 --- a/projects/matez/ng-package.json +++ b/projects/matez/ng-package.json @@ -3,5 +3,14 @@ "dest": "../../dist/matez", "lib": { "entryFile": "src/public-api.ts" - } + }, + "allowedNonPeerDependencies": [ + "@ng-matero/extensions", + "@s-libs/js-core", + "@s-libs/micro-dash", + "@s-libs/ng-core", + "@s-libs/rxjs-core", + "dinero.js", + "papaparse" + ] } From 57a1ac5c08e71dbb1b35639f844c9e6a6780914a Mon Sep 17 00:00:00 2001 From: Rinat Arsaev <11846445+A77AY@users.noreply.github.com> Date: Tue, 12 May 2026 15:03:29 +0400 Subject: [PATCH 04/19] fix --- .github/workflows/main.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index eccc518b8..b24c67cab 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -16,7 +16,6 @@ jobs: with: registry-username: ${{ github.actor }} registry-access-token: ${{ secrets.GITHUB_TOKEN }} - - name: Build MatEz Library run: npm run build -- matez - name: Publish MatEz Library From 0197c63ff65ae92c86a60d03686ea9848820d1bd Mon Sep 17 00:00:00 2001 From: Rinat Arsaev <11846445+A77AY@users.noreply.github.com> Date: Tue, 12 May 2026 15:40:39 +0400 Subject: [PATCH 05/19] fix --- .../matez/src/lib/components/table/table-resource.component.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/matez/src/lib/components/table/table-resource.component.ts b/projects/matez/src/lib/components/table/table-resource.component.ts index 971274288..50e8e4539 100644 --- a/projects/matez/src/lib/components/table/table-resource.component.ts +++ b/projects/matez/src/lib/components/table/table-resource.component.ts @@ -1,7 +1,8 @@ import { Component, TemplateRef, booleanAttribute, computed, input, model } from '@angular/core'; -import { TableModule } from './table.module'; import { ObservableResource, PagedObservableResource } from '../../utils'; + +import { TableModule } from './table.module'; import { Column, UpdateOptions } from './types'; @Component({ From 2a1299722a09754015579a34b134021843afc1b2 Mon Sep 17 00:00:00 2001 From: Rinat Arsaev <11846445+A77AY@users.noreply.github.com> Date: Tue, 12 May 2026 15:53:09 +0400 Subject: [PATCH 06/19] add labeled Co-authored-by: Copilot --- .github/workflows/pr.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index c59163b27..4eee3ca2b 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -1,6 +1,7 @@ name: PR on: pull_request: + types: [opened, synchronize, reopened, labeled] jobs: check: name: Check From 4646688036a03d30cb183e3eba44a9bc7a99fdf1 Mon Sep 17 00:00:00 2001 From: Ray <11846445+A77AY@users.noreply.github.com> Date: Tue, 2 Jun 2026 04:08:19 +0400 Subject: [PATCH 07/19] fix build --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cad3caf2b..50f216340 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "ng": "ng", "start": "ng serve", "prod": "ng serve --configuration=production", - "build": "ng build", + "build": "ng build && ng build matez && ng build ng-thrift", "watch": "ng build --watch --configuration development", "test": "ng test", "lint": "ng lint", From 4eb26a0aea6ca4461455c0ff21e411a02f137c71 Mon Sep 17 00:00:00 2001 From: Ray <11846445+A77AY@users.noreply.github.com> Date: Tue, 2 Jun 2026 04:10:24 +0400 Subject: [PATCH 08/19] fix --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 50f216340..cad3caf2b 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "ng": "ng", "start": "ng serve", "prod": "ng serve --configuration=production", - "build": "ng build && ng build matez && ng build ng-thrift", + "build": "ng build", "watch": "ng build --watch --configuration development", "test": "ng test", "lint": "ng lint", From 712aa6b8f9ab40361debce0e7656295ec3394d84 Mon Sep 17 00:00:00 2001 From: Ray <11846445+A77AY@users.noreply.github.com> Date: Tue, 2 Jun 2026 04:11:33 +0400 Subject: [PATCH 09/19] fix --- .github/workflows/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index b24c67cab..92d6d03ff 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -33,5 +33,5 @@ jobs: - uses: valitydev/action-mattermost-notify@v0 with: webhook: ${{ secrets.MATTERMOST_WEBHOOK_URL }} - channel: 'control-center-new' + channel: 'control-center' username: 'Frontend' From 8fe8631339605997716be4b6eb2698dbab5862e2 Mon Sep 17 00:00:00 2001 From: Ray <11846445+A77AY@users.noreply.github.com> Date: Wed, 3 Jun 2026 01:35:58 +0400 Subject: [PATCH 10/19] test publish --- .github/publish.yaml | 49 +++++++++++++++++++++++++++++++++++++ .github/workflows/main.yaml | 1 - .github/workflows/pr.yaml | 2 +- 3 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 .github/publish.yaml diff --git a/.github/publish.yaml b/.github/publish.yaml new file mode 100644 index 000000000..73da6ee49 --- /dev/null +++ b/.github/publish.yaml @@ -0,0 +1,49 @@ +name: 'Publish to NPM' +description: 'Publish to NPM' + +inputs: + npm-skip-version-up: + description: Skip version up + default: 'false' + required: false + directory: + description: Directory + default: './' + required: false + pr-label: + description: PR label for publish (publish or publish {label}) + default: '' + required: false + pr-version-tag: + description: Version tag for PR + default: 'pr' + required: false + +runs: + using: composite + steps: + - name: Publish + if: > + inputs.pr-label == '' + || contains(github.event.pull_request.labels.*.name, format('publish {0}', inputs.pr-label)) + || contains(github.event.pull_request.labels.*.name, 'publish') + working-directory: ${{ inputs.directory }} + run: | + if [ "${NPM_SKIP_VERSION_UP}" == "false" ]; then + if [ "${GITHUB_EVENT_NAME}" == "pull_request" ]; then + SHA_SHORT="${PR_HEAD_SHA::7}" + PREFIX="${PR_VERSION_TAG}-${PR_NUMBER}-${SHA_SHORT}" + else + PREFIX="${GITHUB_SHA::7}" + fi + + npm version prerelease --preid "${PREFIX}" --no-git-tag-version + fi + + npm publish --tag ${{ github.event_name == 'pull_request' && inputs.pr-version-tag || 'next' }} + shell: bash + env: + NPM_SKIP_VERSION_UP: ${{ inputs.npm-skip-version-up }} + PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }} + PR_NUMBER: ${{ github.event.number }} + PR_VERSION_TAG: ${{ inputs.pr-version-tag }} diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 92d6d03ff..7b83e1b51 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -23,7 +23,6 @@ jobs: with: directory: ./dist/matez npm-token: ${{ secrets.NPM_TOKEN }} - pr-label: 'matez' notify: name: Notify runs-on: ubuntu-latest diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 4eee3ca2b..1331d8524 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -24,7 +24,7 @@ jobs: - name: Build MatEz Library run: npm run build -- matez - name: Publish MatEz Library - uses: valitydev/action-frontend/publish@v2 + uses: ./.github/publish.yaml with: directory: ./dist/matez npm-token: ${{ secrets.NPM_TOKEN }} From e216ea9b6e57dcaf4e4fdab7160c1d72d4a7789f Mon Sep 17 00:00:00 2001 From: Ray <11846445+A77AY@users.noreply.github.com> Date: Wed, 3 Jun 2026 02:18:07 +0400 Subject: [PATCH 11/19] try --- .github/{publish.yaml => publish/action.yaml} | 5 +++++ .github/workflows/pr.yaml | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) rename .github/{publish.yaml => publish/action.yaml} (92%) diff --git a/.github/publish.yaml b/.github/publish/action.yaml similarity index 92% rename from .github/publish.yaml rename to .github/publish/action.yaml index 73da6ee49..3397ed196 100644 --- a/.github/publish.yaml +++ b/.github/publish/action.yaml @@ -10,6 +10,10 @@ inputs: description: Directory default: './' required: false + npm-token: + description: NPM auth token + default: '' + required: false pr-label: description: PR label for publish (publish or publish {label}) default: '' @@ -44,6 +48,7 @@ runs: shell: bash env: NPM_SKIP_VERSION_UP: ${{ inputs.npm-skip-version-up }} + NODE_AUTH_TOKEN: ${{ inputs.npm-token }} PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }} PR_NUMBER: ${{ github.event.number }} PR_VERSION_TAG: ${{ inputs.pr-version-tag }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 1331d8524..ec8e85dc3 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -24,8 +24,7 @@ jobs: - name: Build MatEz Library run: npm run build -- matez - name: Publish MatEz Library - uses: ./.github/publish.yaml + uses: ./.github/publish with: directory: ./dist/matez - npm-token: ${{ secrets.NPM_TOKEN }} pr-label: 'matez' From badb417771f238b4854a86ea26f77532bdfe6b60 Mon Sep 17 00:00:00 2001 From: Ray <11846445+A77AY@users.noreply.github.com> Date: Wed, 3 Jun 2026 17:55:54 +0400 Subject: [PATCH 12/19] try --- .github/workflows/pr.yaml | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index ec8e85dc3..b64619280 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -2,25 +2,28 @@ name: PR on: pull_request: types: [opened, synchronize, reopened, labeled] + +permissions: + contents: read + id-token: write + jobs: - check: - name: Check - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v6 - - uses: valitydev/action-frontend/setup-install@v2 - - name: Check - run: npm run check + # check: + # name: Check + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v6 + # - uses: valitydev/action-frontend/setup-install@v2 + # - name: Check + # run: npm run check build: name: Build runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 - uses: valitydev/action-frontend/setup-install@v2 - with: - npm-install-force: true - - name: Build - run: npm run build + # - name: Build + # run: npm run build - name: Build MatEz Library run: npm run build -- matez - name: Publish MatEz Library From 5e2c2b6c119d5727808b9e64552e7f2b022473e6 Mon Sep 17 00:00:00 2001 From: Ray <11846445+A77AY@users.noreply.github.com> Date: Wed, 3 Jun 2026 18:04:26 +0400 Subject: [PATCH 13/19] try --- .github/workflows/pr.yaml | 7 ++++++- projects/matez/package.json | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index b64619280..edb9b513d 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -16,12 +16,17 @@ jobs: # - uses: valitydev/action-frontend/setup-install@v2 # - name: Check # run: npm run check - build: + check: name: Build runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 - uses: valitydev/action-frontend/setup-install@v2 + # - uses: actions/setup-node@v6 + # with: + # node-version: 'lts' + # registry-url: 'https://registry.npmjs.org' + # package-manager-cache: false # - name: Build # run: npm run build - name: Build MatEz Library diff --git a/projects/matez/package.json b/projects/matez/package.json index fecc4b38b..953790130 100644 --- a/projects/matez/package.json +++ b/projects/matez/package.json @@ -1,6 +1,10 @@ { "name": "@vality/matez", "version": "21.0.0", + "repository": { + "type": "git", + "url": "https://github.com/valitydev/control-center.git" + }, "exports": { ".": { "sass": "./_index.scss" From bef02ffee39f43d5a07d3da5c71240a7dc136749 Mon Sep 17 00:00:00 2001 From: Ray <11846445+A77AY@users.noreply.github.com> Date: Wed, 3 Jun 2026 18:12:58 +0400 Subject: [PATCH 14/19] clean --- .github/workflows/pr.yaml | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index edb9b513d..e11515962 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -8,25 +8,15 @@ permissions: id-token: write jobs: - # check: - # name: Check - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v6 - # - uses: valitydev/action-frontend/setup-install@v2 - # - name: Check - # run: npm run check check: - name: Build + name: Check runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 - - uses: valitydev/action-frontend/setup-install@v2 - # - uses: actions/setup-node@v6 - # with: - # node-version: 'lts' - # registry-url: 'https://registry.npmjs.org' - # package-manager-cache: false + - uses: actions/setup-node@v6 + - run: npm ci + - name: Check + run: npm run check # - name: Build # run: npm run build - name: Build MatEz Library From 6976daf1bc17f431a9535006433f09db1a2edc1e Mon Sep 17 00:00:00 2001 From: Ray <11846445+A77AY@users.noreply.github.com> Date: Wed, 3 Jun 2026 18:24:31 +0400 Subject: [PATCH 15/19] bump nodejs --- .github/workflows/pr.yaml | 2 ++ package.json | 3 +++ 2 files changed, 5 insertions(+) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index e11515962..814845f2c 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -14,6 +14,8 @@ jobs: steps: - uses: actions/checkout@v6 - uses: actions/setup-node@v6 + with: + node-version-file: package.json - run: npm ci - name: Check run: npm run check diff --git a/package.json b/package.json index cad3caf2b..44cba9b7e 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,9 @@ "workspaces": [ "projects/*" ], + "engines": { + "node": ">=26" + }, "private": true, "dependencies": { "@angular/cdk": "^21.2.3", From 5ea40f1034b391bb725979e822186c1086725e84 Mon Sep 17 00:00:00 2001 From: Ray <11846445+A77AY@users.noreply.github.com> Date: Wed, 3 Jun 2026 18:27:05 +0400 Subject: [PATCH 16/19] npm pkg fix --- projects/matez/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/matez/package.json b/projects/matez/package.json index 953790130..cf2874da3 100644 --- a/projects/matez/package.json +++ b/projects/matez/package.json @@ -3,7 +3,7 @@ "version": "21.0.0", "repository": { "type": "git", - "url": "https://github.com/valitydev/control-center.git" + "url": "git+https://github.com/valitydev/control-center.git" }, "exports": { ".": { From 148549b8a0b504e0823d91aeff67be530372c4cf Mon Sep 17 00:00:00 2001 From: Ray <11846445+A77AY@users.noreply.github.com> Date: Wed, 3 Jun 2026 18:38:15 +0400 Subject: [PATCH 17/19] fix --- .github/publish/action.yaml | 54 ------------------------------------- .github/workflows/main.yaml | 23 +++++++++------- .github/workflows/pr.yaml | 17 +++--------- 3 files changed, 17 insertions(+), 77 deletions(-) delete mode 100644 .github/publish/action.yaml diff --git a/.github/publish/action.yaml b/.github/publish/action.yaml deleted file mode 100644 index 3397ed196..000000000 --- a/.github/publish/action.yaml +++ /dev/null @@ -1,54 +0,0 @@ -name: 'Publish to NPM' -description: 'Publish to NPM' - -inputs: - npm-skip-version-up: - description: Skip version up - default: 'false' - required: false - directory: - description: Directory - default: './' - required: false - npm-token: - description: NPM auth token - default: '' - required: false - pr-label: - description: PR label for publish (publish or publish {label}) - default: '' - required: false - pr-version-tag: - description: Version tag for PR - default: 'pr' - required: false - -runs: - using: composite - steps: - - name: Publish - if: > - inputs.pr-label == '' - || contains(github.event.pull_request.labels.*.name, format('publish {0}', inputs.pr-label)) - || contains(github.event.pull_request.labels.*.name, 'publish') - working-directory: ${{ inputs.directory }} - run: | - if [ "${NPM_SKIP_VERSION_UP}" == "false" ]; then - if [ "${GITHUB_EVENT_NAME}" == "pull_request" ]; then - SHA_SHORT="${PR_HEAD_SHA::7}" - PREFIX="${PR_VERSION_TAG}-${PR_NUMBER}-${SHA_SHORT}" - else - PREFIX="${GITHUB_SHA::7}" - fi - - npm version prerelease --preid "${PREFIX}" --no-git-tag-version - fi - - npm publish --tag ${{ github.event_name == 'pull_request' && inputs.pr-version-tag || 'next' }} - shell: bash - env: - NPM_SKIP_VERSION_UP: ${{ inputs.npm-skip-version-up }} - NODE_AUTH_TOKEN: ${{ inputs.npm-token }} - PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }} - PR_NUMBER: ${{ github.event.number }} - PR_VERSION_TAG: ${{ inputs.pr-version-tag }} diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 7b83e1b51..6b6fc6924 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -2,13 +2,22 @@ name: Main on: push: branches: ['master', 'main', 'epic/*'] + +permissions: + contents: read + id-token: write + jobs: deploy: name: Deploy runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 - - uses: valitydev/action-frontend/setup-install@v2 + - uses: actions/setup-node@v6 + with: + node-version-file: package.json + - name: Install dependencies + run: npm ci - name: Build run: npm run build - name: Deploy image @@ -19,17 +28,11 @@ jobs: - name: Build MatEz Library run: npm run build -- matez - name: Publish MatEz Library - uses: valitydev/action-frontend/publish@v2 + uses: ./.github/publish with: directory: ./dist/matez - npm-token: ${{ secrets.NPM_TOKEN }} - notify: - name: Notify - runs-on: ubuntu-latest - needs: [deploy] - steps: - - uses: actions/checkout@v4 - - uses: valitydev/action-mattermost-notify@v0 + - name: Notify Mattermost + uses: valitydev/action-mattermost-notify@v0 with: webhook: ${{ secrets.MATTERMOST_WEBHOOK_URL }} channel: 'control-center' diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 814845f2c..2e071b466 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -1,11 +1,6 @@ name: PR on: pull_request: - types: [opened, synchronize, reopened, labeled] - -permissions: - contents: read - id-token: write jobs: check: @@ -16,15 +11,11 @@ jobs: - uses: actions/setup-node@v6 with: node-version-file: package.json - - run: npm ci + - name: Install dependencies + run: npm ci - name: Check run: npm run check - # - name: Build - # run: npm run build + - name: Build + run: npm run build - name: Build MatEz Library run: npm run build -- matez - - name: Publish MatEz Library - uses: ./.github/publish - with: - directory: ./dist/matez - pr-label: 'matez' From dfae6a4d7aaa89f15e99de628e91ce936e486391 Mon Sep 17 00:00:00 2001 From: Ray <11846445+A77AY@users.noreply.github.com> Date: Wed, 3 Jun 2026 18:40:33 +0400 Subject: [PATCH 18/19] try --- package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/package.json b/package.json index 44cba9b7e..cad3caf2b 100644 --- a/package.json +++ b/package.json @@ -20,9 +20,6 @@ "workspaces": [ "projects/*" ], - "engines": { - "node": ">=26" - }, "private": true, "dependencies": { "@angular/cdk": "^21.2.3", From 790feac4bfbc1eb2a8c3e0ac92b02324090d133c Mon Sep 17 00:00:00 2001 From: Ray <11846445+A77AY@users.noreply.github.com> Date: Wed, 3 Jun 2026 19:16:37 +0400 Subject: [PATCH 19/19] simplify --- .github/workflows/main.yaml | 8 +++----- .github/workflows/pr.yaml | 6 +----- package-lock.json | 3 +++ package.json | 3 +++ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 6b6fc6924..c8931bb09 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -13,11 +13,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 - - uses: actions/setup-node@v6 + - uses: valitydev/action-frontend/setup-install@v3 with: - node-version-file: package.json - - name: Install dependencies - run: npm ci + release: true - name: Build run: npm run build - name: Deploy image @@ -28,7 +26,7 @@ jobs: - name: Build MatEz Library run: npm run build -- matez - name: Publish MatEz Library - uses: ./.github/publish + uses: valitydev/action-frontend/publish@v3 with: directory: ./dist/matez - name: Notify Mattermost diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 2e071b466..0dbc5c1b7 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -8,11 +8,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 - - uses: actions/setup-node@v6 - with: - node-version-file: package.json - - name: Install dependencies - run: npm ci + - uses: valitydev/action-frontend/setup-install@v3 - name: Check run: npm run check - name: Build diff --git a/package-lock.json b/package-lock.json index 13eb75ccd..2a7adefd8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -75,6 +75,9 @@ "prettier-plugin-organize-attributes": "^1.0.0", "typescript": "~5.9.3", "typescript-eslint": "^8.57.2" + }, + "engines": { + "node": ">=26" } }, "node_modules/@acrodata/color-picker": { diff --git a/package.json b/package.json index cad3caf2b..44cba9b7e 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,9 @@ "workspaces": [ "projects/*" ], + "engines": { + "node": ">=26" + }, "private": true, "dependencies": { "@angular/cdk": "^21.2.3",