Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 18 additions & 36 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,54 +2,36 @@ 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@v4
- uses: valitydev/action-frontend/setup-install@v2
- uses: actions/checkout@v6
- uses: valitydev/action-frontend/setup-install@v3
with:
release: true
- name: Build
run: npm run build
- name: Deploy image
uses: valitydev/action-deploy-docker@v2
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
notify:
name: Notify
runs-on: ubuntu-latest
needs: [deploy]
steps:
- uses: actions/checkout@v4
- uses: valitydev/action-mattermost-notify@v0
- name: Build MatEz Library
run: npm run build -- matez
- name: Publish MatEz Library
uses: valitydev/action-frontend/publish@v3
with:
directory: ./dist/matez
- name: Notify Mattermost
uses: valitydev/action-mattermost-notify@v0
with:
webhook: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
channel: 'control-center-new'
channel: 'control-center'
username: 'Frontend'
37 changes: 5 additions & 32 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
@@ -1,44 +1,17 @@
name: PR
on:
pull_request:

jobs:
check:
name: Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: valitydev/action-frontend/setup-install@v2
- uses: actions/checkout@v6
- uses: valitydev/action-frontend/setup-install@v3
- 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: 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: Build MatEz Library
run: npm run build -- matez
20 changes: 13 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
"workspaces": [
"projects/*"
],
"engines": {
"node": ">=26"
},
"private": true,
"dependencies": {
"@angular/cdk": "^21.2.3",
Expand Down
11 changes: 10 additions & 1 deletion projects/matez/ng-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
6 changes: 5 additions & 1 deletion projects/matez/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"name": "@vality/matez",
"version": "21.0.0",
"repository": {
"type": "git",
"url": "git+https://github.com/valitydev/control-center.git"
},
"exports": {
".": {
"sass": "./_index.scss"
Expand All @@ -24,12 +28,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": {
Expand Down
1 change: 1 addition & 0 deletions projects/matez/src/lib/components/cmdk/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { Component, TemplateRef, booleanAttribute, computed, input, model } from '@angular/core';

import { Column, ObservableResource, PagedObservableResource, UpdateOptions } from '@vality/matez';
import { ObservableResource, PagedObservableResource } from '../../utils';

import { TableModule } from './table.module';
import { Column, UpdateOptions } from './types';

@Component({
selector: 'v-table-resource',
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Loading