From df41dda7dc58ac558ffcecb6ade56dc38decd951 Mon Sep 17 00:00:00 2001 From: Bastian Wagner Date: Tue, 17 Feb 2026 10:56:08 +0100 Subject: [PATCH] refactor --- .github/workflows/deploy.yml | 41 ------------------- .github/workflows/test.yml | 26 ------------ client/src/app/modules/keys/keys.component.ts | 5 ++- .../ag-key-actions.component.html} | 0 .../ag-key-actions.component.scss} | 0 .../ag-key-actions.component.ts} | 6 +-- 6 files changed, 6 insertions(+), 72 deletions(-) delete mode 100644 .github/workflows/deploy.yml delete mode 100644 .github/workflows/test.yml rename client/src/app/shared/ag-grid/components/{ag-delete-key/ag-delete-key.component.html => ag-key-actions/ag-key-actions.component.html} (100%) rename client/src/app/shared/ag-grid/components/{ag-delete-key/ag-delete-key.component.scss => ag-key-actions/ag-key-actions.component.scss} (100%) rename client/src/app/shared/ag-grid/components/{ag-delete-key/ag-delete-key.component.ts => ag-key-actions/ag-key-actions.component.ts} (95%) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml deleted file mode 100644 index 8ec40ee..0000000 --- a/.github/workflows/deploy.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Docker Image CI for GHCR - -on: - workflow_run: - workflows: ["Run Unit-Tests"] - types: - - completed - branches: - - master -jobs: - build_and_publish_backend: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Build and Push Image - run: | - docker login --username wagnerbastian --password ${{ secrets.GH_PAT }} ghcr.io - docker build ./api --tag ghcr.io/wagnerbastian/keyvault_pro_api:latest - docker push ghcr.io/wagnerbastian/keyvault_pro_api:latest - build_and_publish_frontend: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Build and Push Image - run: | - docker login --username wagnerbastian --password ${{ secrets.GH_PAT }} ghcr.io - docker build ./client --tag ghcr.io/wagnerbastian/keyvault_pro_client:latest - docker push ghcr.io/wagnerbastian/keyvault_pro_client:latest - ssh-login-and-publish: - runs-on: ubuntu-latest - needs: [build_and_publish_frontend, build_and_publish_backend] - steps: - - - name: Setup SSH Keys and known_hosts - run: | - install -m 600 -D /dev/null ~/.ssh/id_rsa - echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa - ssh-keyscan -H ${{ secrets.SERVER_HOST }} > ~/.ssh/known_hosts - - name: connect and pull - run: | - ssh ${{ secrets.SERVER_USERNAME }}@${{ secrets.SERVER_HOST }} "cd docker/keyvault && docker stop keyvault_client || true && docker rm keyvault_client || true && docker stop keyvault_pro_api || true && docker rm keyvault_pro_api || true && docker-compose pull && docker-compose up -d" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index 3677789..0000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Run Unit-Tests - -on: - push: - branches: ["*"] # Alle Branches - tags: ["*"] # Alle Tags - -jobs: - test_frontend: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Run Unit-Tests Frontend - run: | - cd client - npm install - npm run test - test_backend: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Run Unit-Tests Backend - run: | - cd api - npm install - npm run test \ No newline at end of file diff --git a/client/src/app/modules/keys/keys.component.ts b/client/src/app/modules/keys/keys.component.ts index b898078..9f851e9 100644 --- a/client/src/app/modules/keys/keys.component.ts +++ b/client/src/app/modules/keys/keys.component.ts @@ -9,7 +9,7 @@ import { HotToastService } from '@ngxpert/hot-toast'; import { MatButtonModule } from '@angular/material/button'; import { MatDialog, MatDialogModule } from '@angular/material/dialog'; import { CreateKeyComponent } from './create/create.component'; -import { AgDeleteKeyComponent } from '../../shared/ag-grid/components/ag-delete-key/ag-delete-key.component'; +import { AgKeyActionsComponent } from '../../shared/ag-grid/components/ag-key-actions/ag-key-actions.component'; import { MatIconModule } from '@angular/material/icon'; import { ArchiveComponent } from './components/archive/archive.component'; import { AgLoadingComponent } from '../../shared/ag-grid/components/ag-loading/ag-loading.component'; @@ -88,7 +88,8 @@ export class KeysComponent { colId: 'actions' , headerName: 'Aktionen' , width: 140 - , cellRenderer: AgDeleteKeyComponent + , cellRenderer: AgKeyActionsComponent + , sortable: false // , onCellClicked: (event) => { this.deleteKey(event.data.id)} ,valueFormatter: (data: any) => { return data; }, } diff --git a/client/src/app/shared/ag-grid/components/ag-delete-key/ag-delete-key.component.html b/client/src/app/shared/ag-grid/components/ag-key-actions/ag-key-actions.component.html similarity index 100% rename from client/src/app/shared/ag-grid/components/ag-delete-key/ag-delete-key.component.html rename to client/src/app/shared/ag-grid/components/ag-key-actions/ag-key-actions.component.html diff --git a/client/src/app/shared/ag-grid/components/ag-delete-key/ag-delete-key.component.scss b/client/src/app/shared/ag-grid/components/ag-key-actions/ag-key-actions.component.scss similarity index 100% rename from client/src/app/shared/ag-grid/components/ag-delete-key/ag-delete-key.component.scss rename to client/src/app/shared/ag-grid/components/ag-key-actions/ag-key-actions.component.scss diff --git a/client/src/app/shared/ag-grid/components/ag-delete-key/ag-delete-key.component.ts b/client/src/app/shared/ag-grid/components/ag-key-actions/ag-key-actions.component.ts similarity index 95% rename from client/src/app/shared/ag-grid/components/ag-delete-key/ag-delete-key.component.ts rename to client/src/app/shared/ag-grid/components/ag-key-actions/ag-key-actions.component.ts index 7ba468f..b4e70b1 100644 --- a/client/src/app/shared/ag-grid/components/ag-delete-key/ag-delete-key.component.ts +++ b/client/src/app/shared/ag-grid/components/ag-key-actions/ag-key-actions.component.ts @@ -14,10 +14,10 @@ import { CreateKeyComponent } from '../../../../modules/keys/create/create.compo @Component({ selector: 'app-ag-delete-key', imports: [MatDialogModule, MatTooltipModule], - templateUrl: './ag-delete-key.component.html', - styleUrl: './ag-delete-key.component.scss' + templateUrl: './ag-key-actions.component.html', + styleUrl: './ag-key-actions.component.scss' }) -export class AgDeleteKeyComponent implements ICellRendererAngularComp { +export class AgKeyActionsComponent implements ICellRendererAngularComp { key!: IKey; params!: ICellRendererParams;