Skip to content

Commit

Permalink
Merge branch 'main' into users/aagash/intermittent-mention-test
Browse files Browse the repository at this point in the history
  • Loading branch information
vivinkrishna-ni authored Oct 4, 2024
2 parents aed3beb + 0d3db60 commit 5554518
Show file tree
Hide file tree
Showing 161 changed files with 4,236 additions and 4,634 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ This repository uses the following tooling. See below for more info.

### Adding a new component

1. Write a spec describing the API and behavior of the component. See instructions for [component specs](/specs/README.md).
2. Ensure UX specs are up to date and tokens are generated. See instructions for [contributing to Nimble Tokens](/packages/nimble-tokens/CONTRIBUTING.md).
3. Expose any tokens in the token provider and add web component logic. See instructions for [contributing to Nimble Components](/packages/nimble-components/CONTRIBUTING.md).
1. Follow the instructions in [component specs](/specs/README.md) to approve the direction and create specs for interaction design, visual design, and implementation.
2. Ensure base tokens and icons are available. See instructions for [contributing to Nimble Tokens](/packages/nimble-tokens/CONTRIBUTING.md).
3. Build the web component, including adding theme-aware tokens, documentation, and component logic. See instructions for [contributing to Nimble Components](/packages/nimble-components/CONTRIBUTING.md).
4. Add wrappers for each framework. See instructions for [adding Angular wrappers](/packages/angular-workspace/nimble-angular/CONTRIBUTING.md). See instructions for [adding Blazor wrappers](/packages/blazor-workspace/NimbleBlazor/CONTRIBUTING.md).
5. Publish and use! 🎉

Expand Down
7,188 changes: 2,865 additions & 4,323 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"sync": "beachball sync",
"invoke-publish": "cross-env-shell beachball publish --yes --access public --message \\\"applying package updates [skip ci]\\\" -n $NPM_SECRET_TOKEN",
"performance": "npm run performance --workspaces --if-present",
"validate": "concurrently --timings --group \"npm:validate:*\"",
"validate": "concurrently --pad-prefix --timings --group \"npm:validate:*\"",
"validate:lint:sequential": "npm run lint --workspaces --if-present",
"validate:test:sequential": "npm run test --workspaces --if-present",
"validate:lint-concurrent:nimble-components": "npm run lint-concurrent -w packages/nimble-components",
"validate:test-concurrent:nimble-components": "npm run test-concurrent -w packages/nimble-components",
"test": "concurrently --timings --group \"npm:validate:test*\"",
"lint": "concurrently --timings --group \"npm:validate:lint*\"",
"test": "concurrently --pad-prefix --timings --group \"npm:validate:test*\"",
"lint": "concurrently --pad-prefix --timings --group \"npm:validate:lint*\"",
"storybook": "npm run start -w @ni-private/storybook"
},
"repository": {
Expand Down Expand Up @@ -57,7 +57,7 @@
],
"devDependencies": {
"beachball": "^2.45.0",
"concurrently": "^8.2.2",
"concurrently": "^9.0.0",
"cross-env": "^7.0.3",
"patch-package": "^8.0.0",
"playwright": "1.44.0"
Expand Down
66 changes: 66 additions & 0 deletions packages/angular-workspace/nimble-angular/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,72 @@
{
"name": "@ni/nimble-angular",
"entries": [
{
"date": "Thu, 26 Sep 2024 18:24:50 GMT",
"version": "28.2.9",
"tag": "@ni/nimble-angular_v28.2.9",
"comments": {
"patch": [
{
"author": "rajsite@users.noreply.github.com",
"package": "@ni/nimble-angular",
"commit": "7ab95a37c760071310a52e0ac233978470168f44",
"comment": "Updates for async eslint rule change"
},
{
"author": "beachball",
"package": "@ni/nimble-angular",
"comment": "Bump @ni/nimble-components to v32.2.10",
"commit": "not available"
}
]
}
},
{
"date": "Thu, 26 Sep 2024 17:20:39 GMT",
"version": "28.2.8",
"tag": "@ni/nimble-angular_v28.2.8",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/nimble-angular",
"comment": "Bump @ni/nimble-components to v32.2.9",
"commit": "not available"
}
]
}
},
{
"date": "Thu, 26 Sep 2024 15:22:45 GMT",
"version": "28.2.7",
"tag": "@ni/nimble-angular_v28.2.7",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/nimble-angular",
"comment": "Bump @ni/nimble-components to v32.2.8",
"commit": "not available"
}
]
}
},
{
"date": "Wed, 25 Sep 2024 22:17:40 GMT",
"version": "28.2.6",
"tag": "@ni/nimble-angular_v28.2.6",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/nimble-angular",
"comment": "Bump @ni/nimble-components to v32.2.7",
"commit": "not available"
}
]
}
},
{
"date": "Wed, 18 Sep 2024 20:24:09 GMT",
"version": "28.2.5",
Expand Down
35 changes: 34 additions & 1 deletion packages/angular-workspace/nimble-angular/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,42 @@
# Change Log - @ni/nimble-angular

This log was last generated on Wed, 18 Sep 2024 20:24:09 GMT and should not be manually modified.
<!-- This log was last generated on Thu, 26 Sep 2024 18:24:50 GMT and should not be manually modified. -->

<!-- Start content -->

## 28.2.9

Thu, 26 Sep 2024 18:24:50 GMT

### Patches

- Updates for async eslint rule change ([ni/nimble@7ab95a3](https://github.com/ni/nimble/commit/7ab95a37c760071310a52e0ac233978470168f44))
- Bump @ni/nimble-components to v32.2.10

## 28.2.8

Thu, 26 Sep 2024 17:20:39 GMT

### Patches

- Bump @ni/nimble-components to v32.2.9

## 28.2.7

Thu, 26 Sep 2024 15:22:45 GMT

### Patches

- Bump @ni/nimble-components to v32.2.8

## 28.2.6

Wed, 25 Sep 2024 22:17:40 GMT

### Patches

- Bump @ni/nimble-components to v32.2.7

## 28.2.5

Wed, 18 Sep 2024 20:24:09 GMT
Expand Down
4 changes: 2 additions & 2 deletions packages/angular-workspace/nimble-angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ni/nimble-angular",
"version": "28.2.5",
"version": "28.2.9",
"description": "Angular components for the NI Nimble Design System",
"scripts": {
"invoke-publish": "npm run invoke-publish:setup && cd ../dist/nimble-angular && npm publish",
Expand Down Expand Up @@ -32,7 +32,7 @@
"@angular/forms": "^17.3.12",
"@angular/localize": "^17.3.12",
"@angular/router": "^17.3.12",
"@ni/nimble-components": "^32.2.6"
"@ni/nimble-components": "^32.2.10"
},
"dependencies": {
"tslib": "^2.2.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export class NimbleDialogDirective<CloseReason = void> {
public constructor(private readonly renderer: Renderer2, private readonly elementRef: ElementRef<Dialog<CloseReason>>) {}

public async show(): Promise<CloseReason | UserDismissed> {
return this.elementRef.nativeElement.show();
return await this.elementRef.nativeElement.show();
}

public close(reason: CloseReason): void {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export class NimbleDrawerDirective<CloseReason = void> {
public constructor(private readonly renderer: Renderer2, private readonly elementRef: ElementRef<Drawer<CloseReason>>) {}

public async show(): Promise<CloseReason | UserDismissed> {
return this.elementRef.nativeElement.show();
return await this.elementRef.nativeElement.show();
}

public close(reason: CloseReason): void {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,18 +84,18 @@ export class NimbleTableDirective<TData extends TableRecord = TableRecord> imple
}

public async setData(data: readonly TData[]): Promise<void> {
return this.elementRef.nativeElement.setData(data);
await this.elementRef.nativeElement.setData(data);
}

public async getSelectedRecordIds(): Promise<string[]> {
return this.elementRef.nativeElement.getSelectedRecordIds();
return await this.elementRef.nativeElement.getSelectedRecordIds();
}

public async setSelectedRecordIds(recordIds: string[]): Promise<void> {
return this.elementRef.nativeElement.setSelectedRecordIds(recordIds);
await this.elementRef.nativeElement.setSelectedRecordIds(recordIds);
}

public async setRecordHierarchyOptions(hierarchyOptions: TableSetRecordHierarchyOptions[]): Promise<void> {
return this.elementRef.nativeElement.setRecordHierarchyOptions(hierarchyOptions);
await this.elementRef.nativeElement.setRecordHierarchyOptions(hierarchyOptions);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export class TablePageObject<T extends TableRecord> extends NimbleComponentsTabl
const originalSetDataFn = tableElement.setData.bind(tableElement);
tableElement.setData = async (...args): Promise<void> => {
this.mostRecentSetDataPromise = originalSetDataFn(...args);
return this.mostRecentSetDataPromise;
await this.mostRecentSetDataPromise;
};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ describe('Nimble table', () => {
}] as const;

public async initializeTableData(): Promise<void> {
return this.directive.setData(this.originalData);
await this.directive.setData(this.originalData);
}
}

Expand Down
60 changes: 60 additions & 0 deletions packages/angular-workspace/spright-angular/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,66 @@
{
"name": "@ni/spright-angular",
"entries": [
{
"date": "Thu, 26 Sep 2024 18:24:50 GMT",
"version": "5.1.10",
"tag": "@ni/spright-angular_v5.1.10",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/spright-angular",
"comment": "Bump @ni/spright-components to v4.1.10",
"commit": "not available"
}
]
}
},
{
"date": "Thu, 26 Sep 2024 17:20:39 GMT",
"version": "5.1.9",
"tag": "@ni/spright-angular_v5.1.9",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/spright-angular",
"comment": "Bump @ni/spright-components to v4.1.9",
"commit": "not available"
}
]
}
},
{
"date": "Thu, 26 Sep 2024 15:22:45 GMT",
"version": "5.1.8",
"tag": "@ni/spright-angular_v5.1.8",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/spright-angular",
"comment": "Bump @ni/spright-components to v4.1.8",
"commit": "not available"
}
]
}
},
{
"date": "Wed, 25 Sep 2024 22:17:40 GMT",
"version": "5.1.7",
"tag": "@ni/spright-angular_v5.1.7",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/spright-angular",
"comment": "Bump @ni/spright-components to v4.1.7",
"commit": "not available"
}
]
}
},
{
"date": "Wed, 18 Sep 2024 20:24:09 GMT",
"version": "5.1.6",
Expand Down
34 changes: 33 additions & 1 deletion packages/angular-workspace/spright-angular/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,41 @@
# Change Log - @ni/spright-angular

This log was last generated on Wed, 18 Sep 2024 20:24:09 GMT and should not be manually modified.
<!-- This log was last generated on Thu, 26 Sep 2024 18:24:50 GMT and should not be manually modified. -->

<!-- Start content -->

## 5.1.10

Thu, 26 Sep 2024 18:24:50 GMT

### Patches

- Bump @ni/spright-components to v4.1.10

## 5.1.9

Thu, 26 Sep 2024 17:20:39 GMT

### Patches

- Bump @ni/spright-components to v4.1.9

## 5.1.8

Thu, 26 Sep 2024 15:22:45 GMT

### Patches

- Bump @ni/spright-components to v4.1.8

## 5.1.7

Wed, 25 Sep 2024 22:17:40 GMT

### Patches

- Bump @ni/spright-components to v4.1.7

## 5.1.6

Wed, 18 Sep 2024 20:24:09 GMT
Expand Down
4 changes: 2 additions & 2 deletions packages/angular-workspace/spright-angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ni/spright-angular",
"version": "5.1.6",
"version": "5.1.10",
"description": "Angular components for NI Spright",
"scripts": {
"invoke-publish": "npm run invoke-publish:setup && cd ../dist/spright-angular && npm publish",
Expand All @@ -24,7 +24,7 @@
"peerDependencies": {
"@angular/common": "^17.3.12",
"@angular/core": "^17.3.12",
"@ni/spright-components": "^4.1.6"
"@ni/spright-components": "^4.1.10"
},
"dependencies": {
"tslib": "^2.2.0"
Expand Down
Loading

0 comments on commit 5554518

Please sign in to comment.