From 86e6256e4ba41d17c75788d0ceda5ecb6086dcc4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 25 Aug 2023 13:57:33 +0200 Subject: [PATCH 1/6] chore(deps): update web npm packages (#389) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/web/package.json | 4 ++-- packages/web/pnpm-lock.yaml | 32 ++++++++++++++------------------ 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/packages/web/package.json b/packages/web/package.json index 4147e8691..3fb5d73e9 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -44,10 +44,10 @@ "devDependencies": { "ts-proto": "^1.156.7", "tsup": "^7.2.0", - "typescript": "^5.1.6" + "typescript": "^5.2.2" }, "dependencies": { - "protobufjs": "^7.2.4", + "protobufjs": "^7.2.5", "rxjs": "^7.8.1" } } diff --git a/packages/web/pnpm-lock.yaml b/packages/web/pnpm-lock.yaml index 27c26f9f5..633794a44 100644 --- a/packages/web/pnpm-lock.yaml +++ b/packages/web/pnpm-lock.yaml @@ -6,8 +6,8 @@ settings: dependencies: protobufjs: - specifier: ^7.2.4 - version: 7.2.4 + specifier: ^7.2.5 + version: 7.2.5 rxjs: specifier: ^7.8.1 version: 7.8.1 @@ -18,10 +18,10 @@ devDependencies: version: 1.156.7 tsup: specifier: ^7.2.0 - version: 7.2.0(typescript@5.1.6) + version: 7.2.0(typescript@5.2.2) typescript: - specifier: ^5.1.6 - version: 5.1.6 + specifier: ^5.2.2 + version: 5.2.2 packages: @@ -597,12 +597,8 @@ packages: resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==} dev: true - /long@5.2.1: - resolution: {integrity: sha512-GKSNGeNAtw8IryjjkhZxuKB3JzlcLTwjtiQCHKvqQet81I93kXslhDQruGI/QsddO83mcDToBVy7GqGS/zYf/A==} - /long@5.2.3: resolution: {integrity: sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==} - dev: true /merge-stream@2.0.0: resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} @@ -715,8 +711,8 @@ packages: yaml: 2.3.1 dev: true - /protobufjs@7.2.4: - resolution: {integrity: sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==} + /protobufjs@7.2.5: + resolution: {integrity: sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A==} engines: {node: '>=12.0.0'} requiresBuild: true dependencies: @@ -731,7 +727,7 @@ packages: '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 '@types/node': 18.15.11 - long: 5.2.1 + long: 5.2.3 /punycode@2.3.0: resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==} @@ -870,7 +866,7 @@ packages: resolution: {integrity: sha512-TYyJ7+H+7Jsqawdv+mfsEpZPTIj9siDHS6EMCzG/z3b/PZiphsX+mWtqFfFVe5/N0Th6V3elK9lQqjnrgTOfrg==} dependencies: long: 5.2.3 - protobufjs: 7.2.4 + protobufjs: 7.2.5 dev: true /ts-proto@1.156.7: @@ -878,7 +874,7 @@ packages: hasBin: true dependencies: case-anything: 2.1.13 - protobufjs: 7.2.4 + protobufjs: 7.2.5 ts-poet: 6.5.0 ts-proto-descriptors: 1.15.0 dev: true @@ -887,7 +883,7 @@ packages: resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==} dev: false - /tsup@7.2.0(typescript@5.1.6): + /tsup@7.2.0(typescript@5.2.2): resolution: {integrity: sha512-vDHlczXbgUvY3rWvqFEbSqmC1L7woozbzngMqTtL2PGBODTtWlRwGDDawhvWzr5c1QjKe4OAKqJGfE1xeXUvtQ==} engines: {node: '>=16.14'} hasBin: true @@ -917,14 +913,14 @@ packages: source-map: 0.8.0-beta.0 sucrase: 3.31.0 tree-kill: 1.2.2 - typescript: 5.1.6 + typescript: 5.2.2 transitivePeerDependencies: - supports-color - ts-node dev: true - /typescript@5.1.6: - resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==} + /typescript@5.2.2: + resolution: {integrity: sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==} engines: {node: '>=14.17'} hasBin: true dev: true From ec2d855e8aec73509dbe85320d92dee1efdb3988 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 25 Aug 2023 13:58:05 +0200 Subject: [PATCH 2/6] chore(deps): update actions/checkout digest to f43a0e5 (#394) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 16 ++++++++-------- .github/workflows/deploy-docs.yml | 4 ++-- .github/workflows/publish-edge.yml | 14 +++++++------- .github/workflows/release.yml | 14 +++++++------- .github/workflows/validate-docs-generation.yml | 6 +++--- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 02baf6e7b..ff918a201 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: fetch-depth: 0 @@ -37,7 +37,7 @@ jobs: timeout-minutes: 15 steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: ref: ${{ github.ref }} fetch-depth: 0 @@ -83,7 +83,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: ref: ${{ github.ref }} fetch-depth: 0 @@ -126,7 +126,7 @@ jobs: timeout-minutes: 15 steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: ref: ${{ github.ref }} fetch-depth: 0 @@ -142,7 +142,7 @@ jobs: run: working-directory: packages/web steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: fetch-depth: 0 @@ -173,7 +173,7 @@ jobs: run: working-directory: packages/angular steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: fetch-depth: 0 @@ -204,7 +204,7 @@ jobs: run: working-directory: packages/python steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: fetch-depth: 0 @@ -244,7 +244,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: ref: ${{ github.ref }} diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index db233eb92..8b97e470e 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 - run: npm i -g pnpm @antfu/ni @@ -65,7 +65,7 @@ jobs: needs: [generate-proto-docs] steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 # Restore API proto documentation - name: Cache Generated Docs from Protos diff --git a/.github/workflows/publish-edge.yml b/.github/workflows/publish-edge.yml index b5329b345..880228af3 100644 --- a/.github/workflows/publish-edge.yml +++ b/.github/workflows/publish-edge.yml @@ -17,7 +17,7 @@ jobs: version: ${{ steps.genver.outputs.version }} steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: ref: ${{ github.head_ref }} fetch-depth: 0 @@ -51,7 +51,7 @@ jobs: - packages/csharp/ArmoniK.Api.Tests steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: ref: ${{ github.head_ref }} fetch-depth: 0 @@ -91,7 +91,7 @@ jobs: - packages/csharp/ArmoniK.Api.Worker/ArmoniK.Api.Worker.csproj steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: ref: ${{ github.head_ref }} fetch-depth: 0 @@ -119,7 +119,7 @@ jobs: name: Release Angular Package runs-on: ubuntu-latest steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: ref: ${{ github.head_ref }} fetch-depth: 0 @@ -158,7 +158,7 @@ jobs: name: Release Web Package runs-on: ubuntu-latest steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: ref: ${{ github.head_ref }} fetch-depth: 0 @@ -203,7 +203,7 @@ jobs: run: working-directory: packages/python steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: fetch-depth: 0 @@ -243,7 +243,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: ref: ${{ github.ref }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1f5db940d..3508270cc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: fetch-depth: 0 @@ -49,7 +49,7 @@ jobs: - packages/csharp/ArmoniK.Api.Worker/ArmoniK.Api.Worker.csproj steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: fetch-depth: 0 @@ -75,7 +75,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: fetch-depth: 0 @@ -102,7 +102,7 @@ jobs: needs: [verify-versions] runs-on: ubuntu-latest steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: fetch-depth: 0 @@ -135,7 +135,7 @@ jobs: needs: [verify-versions] runs-on: ubuntu-latest steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: fetch-depth: 0 @@ -177,7 +177,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: ref: ${{ github.ref }} @@ -202,7 +202,7 @@ jobs: needs: [verify-versions] runs-on: ubuntu-latest steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: fetch-depth: 0 diff --git a/.github/workflows/validate-docs-generation.yml b/.github/workflows/validate-docs-generation.yml index 9b6aaa23f..dc4b9492d 100644 --- a/.github/workflows/validate-docs-generation.yml +++ b/.github/workflows/validate-docs-generation.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 - run: npm i -g pnpm @antfu/ni @@ -40,7 +40,7 @@ jobs: name: Lint Markdown runs-on: ubuntu-latest steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 - run: npm i -g pnpm @antfu/ni @@ -58,7 +58,7 @@ jobs: name: Lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3 + - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 - run: npm i -g pnpm @antfu/ni From 4ba5769a9234c8c2838719e9b68f5b0371d36f70 Mon Sep 17 00:00:00 2001 From: esoubiran-aneo Date: Fri, 25 Aug 2023 13:59:38 +0200 Subject: [PATCH 3/6] chore: update renovate config for ArmoniK.Utils --- renovate.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/renovate.json b/renovate.json index 85e23cf8a..56c37f04c 100644 --- a/renovate.json +++ b/renovate.json @@ -52,6 +52,16 @@ "nuget" ] }, + { + "groupName": "nuget armonik utils package", + "groupSlug": "nuget", + "matchDatasources": [ + "nuget" + ], + "matchPackagePatterns": [ + "ArmoniK\\.Utils" + ] + }, { "groupName": "python packages", "groupSlug": "pypi", From 6330e9bb16d31d020005818827faac44ae295f6b Mon Sep 17 00:00:00 2001 From: esoubiran-aneo Date: Fri, 25 Aug 2023 14:00:28 +0200 Subject: [PATCH 4/6] chore: fix group slug --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 56c37f04c..b048c0d19 100644 --- a/renovate.json +++ b/renovate.json @@ -54,7 +54,7 @@ }, { "groupName": "nuget armonik utils package", - "groupSlug": "nuget", + "groupSlug": "nuget-armonik-utils", "matchDatasources": [ "nuget" ], From 7889e84c9165e2e52fa12096715f1ec635babfcf Mon Sep 17 00:00:00 2001 From: esoubiran-aneo Date: Fri, 25 Aug 2023 14:03:12 +0200 Subject: [PATCH 5/6] chore: update gen csharp path --- .vscode/settings.json | 12 ++++++------ {gen/csharp => packages/csharp/generated}/.gitkeep | 0 2 files changed, 6 insertions(+), 6 deletions(-) rename {gen/csharp => packages/csharp/generated}/.gitkeep (100%) diff --git a/.vscode/settings.json b/.vscode/settings.json index ed1d1d92e..bdbe81553 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,11 +2,11 @@ "protoc": { "compile_on_save": true, "options": [ - "--proto_path=${workspaceRoot}/Protos/V1", - "--csharp_out=${workspaceRoot}/gen/csharp" + "--proto_path=${workspaceRoot}/Protos/V1", + "--csharp_out=${workspaceRoot}/packages/csharp/generated/" ] -}, -"cSpell.words": [ - "Armoni" -] + }, + "cSpell.words": [ + "Armoni" + ] } diff --git a/gen/csharp/.gitkeep b/packages/csharp/generated/.gitkeep similarity index 100% rename from gen/csharp/.gitkeep rename to packages/csharp/generated/.gitkeep From c5cde92e786488d0b27fab1230f33a1c13b9787c Mon Sep 17 00:00:00 2001 From: esoubiran-aneo Date: Fri, 25 Aug 2023 14:26:08 +0200 Subject: [PATCH 6/6] docs: update angular guide --- .../use-armonik-api-in-an-angular-app.md | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/.docs/content/2.usage/use-armonik-api-in-an-angular-app.md b/.docs/content/2.usage/use-armonik-api-in-an-angular-app.md index 3d06cc07c..800410bf7 100644 --- a/.docs/content/2.usage/use-armonik-api-in-an-angular-app.md +++ b/.docs/content/2.usage/use-armonik-api-in-an-angular-app.md @@ -43,7 +43,7 @@ npm install -g @angular/cli Then, you can create a new Angular App using the following command: ```bash -ng new --standalone --routing=false --inline-style --inline-template --skip-tests --style=css --skip-install armonik-api-angular +ng new --standalone --routing=false --inline-style --inline-template --skip-tests --skip-git --style=css --skip-install --package-manager=pnpm armonik-api-angular ``` Then, go to the newly created folder: @@ -249,7 +249,8 @@ import { NgFor } from '@angular/common'; // ... imports: [ NgFor - ] + ], + // ... }) ``` @@ -330,7 +331,8 @@ Now that you've created our service and our component, you are ready to use them First, you need to inject the service in the component: ```typescript [app.component.ts] -import { Component } from '@angular/core'; +import { Component, inject } from '@angular/core'; +import { PartitionsGrpcService } from './services/partitions-grpc.service'; @Component({ providers: [ @@ -377,7 +379,6 @@ export class AppComponent implements AfterViewInit { } } ); - } } ``` @@ -461,17 +462,14 @@ For simplicity, you will update the service directly. In a real world scenario, + page: 0, + pageSize: 10, + sort: { -+ direction: ListPartitionsRequest.OrderDirection.ORDER_DIRECTION_ASC, -+ field: ListPartitionsRequest.OrderByField.ORDER_BY_FIELD_ID ++ direction: SortDirection.SORT_DIRECTION_ASC, ++ field: { ++ partitionRawField: { ++ field: PartitionRawEnumField.PARTITION_RAW_ENUM_FIELD_ID ++ } ++ } + }, -+ filter: { -+ id: '', -+ parentPartitionId: '', -+ podMax: 0, -+ podReserved: 0, -+ preemptionPercentage: 0, -+ priority: 0, -+ } ++ filters: {} + }); return this.#client.listPartitions(options);