Merge branch 'main' into users/makinc/prevent-id-collision

ni · May 13, 2024 · aed0403 · aed0403
2 parents dbe2a31 + 866e223
commit aed0403
Show file tree

Hide file tree

Showing 98 changed files with 2,116 additions and 265 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -15,7 +15,8 @@
 /packages/blazor-workspace @atmgrifter00 @msmithNI
 /packages/nimble-components @rajsite @jattasNI
 /packages/nimble-components/.storybook @rajsite @jattasNI @fredvisser
-/packages/nimble-components/src/wafer-map @rajsite @jattasNI @DStavilaNI @zszilagy
+/packages/nimble-components/build/generate-workers @rajsite @jattasNI @DStavilaNI @munteannatan
+/packages/nimble-components/src/wafer-map @rajsite @jattasNI @DStavilaNI @munteannatan
 /packages/nimble-components/src/rich-text @rajsite @jattasNI @vivinkrishna-ni
 /packages/nimble-components/src/rich-text-mention @rajsite @jattasNI @vivinkrishna-ni
 /packages/nimble-tokens @rajsite @jattasNI @fredvisser

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -51,7 +51,7 @@ This repository uses the following tooling. See below for more info.
 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).
-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/nimble-blazor/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! 🎉
 
 ## Documentation policies

diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ The Nimble packages contain general-use components implementing the Nimble Desig
 [![Nimble Components NPM version and repo link](https://img.shields.io/npm/v/@ni/nimble-components.svg?label=@ni/nimble-components)](https://www.npmjs.com/package/@ni/nimble-components)
 
 - **[`@ni/nimble-angular`](/packages/angular-workspace/nimble-angular/)** - Angular bindings for Nimble components.
-- **[`@ni/nimble-blazor`](/packages/blazor-workspace/)** - Blazor bindings for Nimble components.
+- **[`@ni/nimble-blazor`](/packages/blazor-workspace/NimbleBlazor/)** - Blazor bindings for Nimble components.
 - **[`@ni/nimble-components`](/packages/nimble-components/)** - Nimble components to be used by [any type of application](https://custom-elements-everywhere.com/).
 
 ### Spright packages
@@ -41,7 +41,7 @@ The Spright packages contain components that are built using Nimble technology a
 [![Spright Components NPM version and repo link](https://img.shields.io/npm/v/@ni/spright-components.svg?label=@ni/spright-components)](https://www.npmjs.com/package/@ni/spright-components)
 
 - [`@ni/spright-angular`](/packages/angular-workspace/spright-angular/) - Angular bindings for Spright components.
-- [`@ni/spright-blazor`](/packages/blazor-workspace/) - Blazor bindings for Spright components.
+- [`@ni/spright-blazor`](/packages/blazor-workspace/SprightBlazor/) - Blazor bindings for Spright components.
 - [`@ni/spright-components`](/packages/spright-components/) - Spright components to be used by [any  type of application](https://custom-elements-everywhere.com/).
 
 ### Utility packages

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/angular-workspace/example-client-app/src/app/app.module.ts b/packages/angular-workspace/example-client-app/src/app/app.module.ts
@@ -18,6 +18,7 @@ import { NimbleMappingTextModule } from '@ni/nimble-angular/mapping/text';
 import { NimbleMappingIconModule } from '@ni/nimble-angular/mapping/icon';
 import { NimbleMappingUserModule } from '@ni/nimble-angular/mapping/user';
 import { NimbleMappingSpinnerModule } from '@ni/nimble-angular/mapping/spinner';
+import { NimbleMappingEmptyModule } from '@ni/nimble-angular/mapping/empty';
 import { NimbleTableModule } from '@ni/nimble-angular/table';
 import { NimbleTableColumnTextModule } from '@ni/nimble-angular/table-column/text';
 import { NimbleTableColumnAnchorModule } from '@ni/nimble-angular/table-column/anchor';
@@ -101,6 +102,7 @@ import { HeaderComponent } from './header/header.component';
         NimbleMappingUserModule,
         NimbleRichTextMentionUsersModule,
         NimbleMappingSpinnerModule,
+        NimbleMappingEmptyModule,
         SprightRectangleModule,
         RouterModule.forRoot(
             [

diff --git a/packages/angular-workspace/example-client-app/src/app/customapp/customapp.component.html b/packages/angular-workspace/example-client-app/src/app/customapp/customapp.component.html
@@ -268,10 +268,14 @@
                         text-hidden>
                     </nimble-mapping-icon>
                     <nimble-mapping-spinner
-                        key="unknown"
-                        text="Unknown"
+                        key="calculating"
+                        text="Calculating"
                         text-hidden>
                     </nimble-mapping-spinner>
+                    <nimble-mapping-empty
+                        key="unknown"
+                        text="Unknown">
+                    </nimble-mapping-empty>
                     <nimble-icon-xmark-check title="Result"></nimble-icon-xmark-check>
                 </nimble-table-column-mapping>
                 <nimble-table-column-number-text

diff --git a/packages/angular-workspace/example-client-app/src/app/customapp/customapp.component.ts b/packages/angular-workspace/example-client-app/src/app/customapp/customapp.component.ts
@@ -153,6 +153,7 @@ export class CustomAppComponent implements AfterViewInit {
 
     public addTableRows(numberOfRowsToAdd: number): void {
         const tableData = this.tableDataSubject.value;
+        const possibleStatuses = ['success', 'calculating', 'unknown'];
         for (let i = 0; i < numberOfRowsToAdd; i++) {
             tableData.push({
                 id: tableData.length.toString(),
@@ -163,7 +164,7 @@ export class CustomAppComponent implements AfterViewInit {
                 linkLabel: 'Link',
                 date: (tableData.length % 2 === 0) ? new Date(2023, 7, 16, 3, 56, 11).valueOf() : new Date(2022, 2, 7, 20, 28, 41).valueOf(),
                 statusCode: (tableData.length % 2 === 0) ? 100 : 101,
-                result: (tableData.length % 2 === 0) ? 'success' : 'unknown',
+                result: possibleStatuses[tableData.length % 3],
                 number: tableData.length / 10,
                 duration: tableData.length * 1000 * (1.1 + 2 * 60 + 3 * 3600)
             });

diff --git a/packages/angular-workspace/example-client-app/src/tests/pipes.spec.ts b/packages/angular-workspace/example-client-app/src/tests/pipes.spec.ts
@@ -1,4 +1,4 @@
-import { DurationPipe, NumberTextPipe, byteUnitScale, byte1024UnitScale, voltUnitScale } from '@ni/nimble-angular/pipes';
+import { DurationPipe, NumberTextPipe, byteUnitScale, byte1024UnitScale, celsiusUnitScale, fahrenheitUnitScale, voltUnitScale } from '@ni/nimble-angular/pipes';
 
 describe('Pipes', () => {
     it('exports DurationPipe', () => {
@@ -17,6 +17,14 @@ describe('Pipes', () => {
         expect(byte1024UnitScale).toBeTruthy();
     });
 
+    it('exports celsiusUnitScale', () => {
+        expect(celsiusUnitScale).toBeTruthy();
+    });
+
+    it('exports fahrenheitUnitScale', () => {
+        expect(fahrenheitUnitScale).toBeTruthy();
+    });
+
     it('exports voltUnitScale', () => {
         expect(voltUnitScale).toBeTruthy();
     });

diff --git a/packages/angular-workspace/nimble-angular/CHANGELOG.json b/packages/angular-workspace/nimble-angular/CHANGELOG.json
@@ -1,6 +1,117 @@
 {
   "name": "@ni/nimble-angular",
   "entries": [
+    {
+      "date": "Mon, 13 May 2024 09:49:02 GMT",
+      "version": "24.2.1",
+      "tag": "@ni/nimble-angular_v24.2.1",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v28.3.1",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 10 May 2024 22:37:40 GMT",
+      "version": "24.2.0",
+      "tag": "@ni/nimble-angular_v24.2.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "20542556+mollykreis@users.noreply.github.com",
+            "package": "@ni/nimble-angular",
+            "commit": "4e595cc0e67a9903510ba60da17afdb1bf2643d6",
+            "comment": "Add support for empty mapping component"
+          },
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v28.3.0",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 10 May 2024 18:51:13 GMT",
+      "version": "24.1.0",
+      "tag": "@ni/nimble-angular_v24.1.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "7282195+m-akinc@users.noreply.github.com",
+            "package": "@ni/nimble-angular",
+            "commit": "7f6a791484cc420725502f5a5e07aa037a952a1f",
+            "comment": "Add Angular support for Celsius and Fahrenheit number format units"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 10 May 2024 16:42:46 GMT",
+      "version": "24.0.9",
+      "tag": "@ni/nimble-angular_v24.0.9",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v28.2.1",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 10 May 2024 16:11:56 GMT",
+      "version": "24.0.8",
+      "tag": "@ni/nimble-angular_v24.0.8",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v28.2.0",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 09 May 2024 20:39:47 GMT",
+      "version": "24.0.7",
+      "tag": "@ni/nimble-angular_v24.0.7",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v28.1.0",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 09 May 2024 18:40:41 GMT",
+      "version": "24.0.6",
+      "tag": "@ni/nimble-angular_v24.0.6",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v28.0.5",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Wed, 08 May 2024 22:21:34 GMT",
       "version": "24.0.5",

diff --git a/packages/angular-workspace/nimble-angular/CHANGELOG.md b/packages/angular-workspace/nimble-angular/CHANGELOG.md
@@ -1,9 +1,66 @@
 # Change Log - @ni/nimble-angular
 
-This log was last generated on Wed, 08 May 2024 22:21:34 GMT and should not be manually modified.
+This log was last generated on Mon, 13 May 2024 09:49:02 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 24.2.1
+
+Mon, 13 May 2024 09:49:02 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v28.3.1
+
+## 24.2.0
+
+Fri, 10 May 2024 22:37:40 GMT
+
+### Minor changes
+
+- Add support for empty mapping component ([ni/nimble@4e595cc](https://github.com/ni/nimble/commit/4e595cc0e67a9903510ba60da17afdb1bf2643d6))
+- Bump @ni/nimble-components to v28.3.0
+
+## 24.1.0
+
+Fri, 10 May 2024 18:51:13 GMT
+
+### Minor changes
+
+- Add Angular support for Celsius and Fahrenheit number format units ([ni/nimble@7f6a791](https://github.com/ni/nimble/commit/7f6a791484cc420725502f5a5e07aa037a952a1f))
+
+## 24.0.9
+
+Fri, 10 May 2024 16:42:46 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v28.2.1
+
+## 24.0.8
+
+Fri, 10 May 2024 16:11:56 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v28.2.0
+
+## 24.0.7
+
+Thu, 09 May 2024 20:39:47 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v28.1.0
+
+## 24.0.6
+
+Thu, 09 May 2024 18:40:41 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v28.0.5
+
 ## 24.0.5
 
 Wed, 08 May 2024 22:21:34 GMT

diff --git a/packages/angular-workspace/nimble-angular/mapping/empty/ng-package.json b/packages/angular-workspace/nimble-angular/mapping/empty/ng-package.json
@@ -0,0 +1,6 @@
+{
+    "$schema": "../../../../../node_modules/ng-packagr/ng-package.schema.json",
+    "lib": {
+      "entryFile": "public-api.ts"
+    }
+}