Skip to content

Commit

Permalink
Merge branch 'main' into chore/lint-js
Browse files Browse the repository at this point in the history
  • Loading branch information
esoubiran-aneo authored Aug 25, 2023
2 parents 9c01cce + 1c36d7c commit 37d8ad6
Show file tree
Hide file tree
Showing 11 changed files with 66 additions and 62 deletions.
26 changes: 12 additions & 14 deletions .docs/content/2.usage/use-armonik-api-in-an-angular-app.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -249,7 +249,8 @@ import { NgFor } from '@angular/common';
// ...
imports: [
NgFor
]
],
// ...
})
```

Expand Down Expand Up @@ -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: [
Expand Down Expand Up @@ -377,7 +379,6 @@ export class AppComponent implements AfterViewInit {
}
}
);

}
}
```
Expand Down Expand Up @@ -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);
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -159,7 +159,7 @@ jobs:
run:
working-directory: packages/web
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
with:
fetch-depth: 0

Expand Down Expand Up @@ -190,7 +190,7 @@ jobs:
run:
working-directory: packages/angular
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
with:
fetch-depth: 0

Expand Down Expand Up @@ -221,7 +221,7 @@ jobs:
run:
working-directory: packages/python
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
with:
fetch-depth: 0

Expand Down Expand Up @@ -261,7 +261,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
with:
ref: ${{ github.ref }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/publish-edge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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 }}

Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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 }}

Expand All @@ -201,7 +201,7 @@ jobs:
needs: [verify-versions]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
with:
fetch-depth: 0

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/validate-docs-generation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -39,7 +39,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

Expand All @@ -57,7 +57,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

Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"compile_on_save": true,
"options": [
"--proto_path=${workspaceRoot}/Protos/V1",
"--csharp_out=${workspaceRoot}/gen/csharp"
"--csharp_out=${workspaceRoot}/packages/csharp/generated/"
]
},
"cSpell.words": [
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions packages/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
"prepublish": "cp ../../LICENSE ./LICENSE"
},
"dependencies": {
"protobufjs": "^7.2.4",
"protobufjs": "^7.2.5",
"rxjs": "^7.8.1"
},
"devDependencies": {
"ts-proto": "^1.156.7",
"tsup": "^7.2.0",
"typescript": "^5.1.6"
"typescript": "^5.2.2"
}
}
Loading

0 comments on commit 37d8ad6

Please sign in to comment.