Merge branch 'main' into users-fvisser-dependency-review-action

ni · Mar 20, 2024 · 06d630b · 06d630b
2 parents 2ca6b1d + 8bb2c33
commit 06d630b
Show file tree

Hide file tree

Showing 49 changed files with 1,235 additions and 357 deletions.
diff --git a/angular-workspace/projects/ni/nimble-angular/CHANGELOG.json b/angular-workspace/projects/ni/nimble-angular/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@ni/nimble-angular",
   "entries": [
+    {
+      "date": "Mon, 18 Mar 2024 17:12:34 GMT",
+      "version": "20.5.0",
+      "tag": "@ni/nimble-angular_v20.5.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "20542556+mollykreis@users.noreply.github.com",
+            "package": "@ni/nimble-angular",
+            "commit": "3bbf8d7cd86d0129e9ad6bb0eed245ea2bfc0fda",
+            "comment": "Add new properties to the table label provider"
+          },
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v22.1.0",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Thu, 14 Mar 2024 14:48:16 GMT",
       "version": "20.4.1",

diff --git a/angular-workspace/projects/ni/nimble-angular/CHANGELOG.md b/angular-workspace/projects/ni/nimble-angular/CHANGELOG.md
@@ -1,9 +1,18 @@
 # Change Log - @ni/nimble-angular
 
-This log was last generated on Thu, 14 Mar 2024 14:48:16 GMT and should not be manually modified.
+This log was last generated on Mon, 18 Mar 2024 17:12:34 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 20.5.0
+
+Mon, 18 Mar 2024 17:12:34 GMT
+
+### Minor changes
+
+- Add new properties to the table label provider ([ni/nimble@3bbf8d7](https://github.com/ni/nimble/commit/3bbf8d7cd86d0129e9ad6bb0eed245ea2bfc0fda))
+- Bump @ni/nimble-components to v22.1.0
+
 ## 20.4.1
 
 Thu, 14 Mar 2024 14:48:16 GMT

diff --git a/...imble-angular/label-provider/table/nimble-label-provider-table-with-defaults.directive.ts b/...imble-angular/label-provider/table/nimble-label-provider-table-with-defaults.directive.ts
@@ -26,5 +26,7 @@ export class NimbleLabelProviderTableWithDefaultsDirective {
         this.elementRef.nativeElement.rowSelect = $localize`:Nimble table - select row|:Select row`;
         this.elementRef.nativeElement.rowOperationColumn = $localize`:Nimble table - row operation column|:Row operations`;
         this.elementRef.nativeElement.rowLoading = $localize`:Nimble table - row loading|:Loading`;
+        this.elementRef.nativeElement.groupRowPlaceholderNoValue = $localize`:Nimble table - group row placeholder no value|:No value`;
+        this.elementRef.nativeElement.groupRowPlaceholderEmpty = $localize`:Nimble table - group row placeholder empty|:Empty`;
     }
 }
diff --git a/.../projects/ni/nimble-angular/label-provider/table/nimble-label-provider-table.directive.ts b/.../projects/ni/nimble-angular/label-provider/table/nimble-label-provider-table.directive.ts
@@ -127,4 +127,20 @@ export class NimbleLabelProviderTableDirective {
     @Input('row-loading') public set rowLoading(value: string | undefined) {
         this.renderer.setProperty(this.elementRef.nativeElement, 'rowLoading', value);
     }
+
+    public get groupRowPlaceholderNoValue(): string | undefined {
+        return this.elementRef.nativeElement.groupRowPlaceholderNoValue;
+    }
+
+    @Input('group-row-placeholder-no-value') public set groupRowPlaceholderNoValue(value: string | undefined) {
+        this.renderer.setProperty(this.elementRef.nativeElement, 'groupRowPlaceholderNoValue', value);
+    }
+
+    public get groupRowPlaceholderEmpty(): string | undefined {
+        return this.elementRef.nativeElement.groupRowPlaceholderEmpty;
+    }
+
+    @Input('group-row-placeholder-empty') public set groupRowPlaceholderEmpty(value: string | undefined) {
+        this.renderer.setProperty(this.elementRef.nativeElement, 'groupRowPlaceholderEmpty', value);
+    }
 }
diff --git a/...ar/label-provider/table/tests/nimble-label-provider-table-with-defaults.directive.spec.ts b/...ar/label-provider/table/tests/nimble-label-provider-table-with-defaults.directive.spec.ts
@@ -42,6 +42,8 @@ describe('Nimble LabelProviderTable withDefaults directive', () => {
             [computeMsgId('Select row', 'Nimble table - select row')]: 'Translated select row',
             [computeMsgId('Row operations', 'Nimble table - row operation column')]: 'Translated row operations',
             [computeMsgId('Loading', 'Nimble table - row loading')]: 'Translated loading',
+            [computeMsgId('No value', 'Nimble table - group row placeholder no value')]: 'Translated no value',
+            [computeMsgId('Empty', 'Nimble table - group row placeholder empty')]: 'Translated empty',
         });
         const fixture = TestBed.createComponent(TestHostComponent);
         const testHostComponent = fixture.componentInstance;
@@ -64,5 +66,7 @@ describe('Nimble LabelProviderTable withDefaults directive', () => {
         expect(labelProvider.rowSelect).toBe('Translated select row');
         expect(labelProvider.rowOperationColumn).toBe('Translated row operations');
         expect(labelProvider.rowLoading).toBe('Translated loading');
+        expect(labelProvider.groupRowPlaceholderNoValue).toBe('Translated no value');
+        expect(labelProvider.groupRowPlaceholderEmpty).toBe('Translated empty');
     });
 });
diff --git a/...i/nimble-angular/label-provider/table/tests/nimble-label-provider-table.directive.spec.ts b/...i/nimble-angular/label-provider/table/tests/nimble-label-provider-table.directive.spec.ts
@@ -18,6 +18,8 @@ describe('Nimble Label Provider Table', () => {
     const label12 = 'String 12';
     const label13 = 'String 13';
     const label14 = 'String 14';
+    const label15 = 'String 15';
+    const label16 = 'String 16';
 
     beforeEach(() => {
         TestBed.configureTestingModule({
@@ -124,6 +126,16 @@ describe('Nimble Label Provider Table', () => {
             expect(directive.rowLoading).toBeUndefined();
             expect(nativeElement.rowLoading).toBeUndefined();
         });
+
+        it('has expected defaults for groupRowPlaceholderNoValue', () => {
+            expect(directive.groupRowPlaceholderNoValue).toBeUndefined();
+            expect(nativeElement.groupRowPlaceholderNoValue).toBeUndefined();
+        });
+
+        it('has expected defaults for groupRowPlaceholderEmpty', () => {
+            expect(directive.groupRowPlaceholderEmpty).toBeUndefined();
+            expect(nativeElement.groupRowPlaceholderEmpty).toBeUndefined();
+        });
     });
 
     describe('with template string values', () => {
@@ -144,6 +156,8 @@ describe('Nimble Label Provider Table', () => {
                     row-select="${label12}"
                     row-operation-column="${label13}"
                     row-loading="${label14}"
+                    group-row-placeholder-no-value="${label15}"
+                    group-row-placeholder-empty="${label16}"
                     >
                 </nimble-label-provider-table>
             `
@@ -237,6 +251,16 @@ describe('Nimble Label Provider Table', () => {
             expect(directive.rowLoading).toBe(label14);
             expect(nativeElement.rowLoading).toBe(label14);
         });
+
+        it('will use template string values for groupRowPlaceholderNoValue', () => {
+            expect(directive.groupRowPlaceholderNoValue).toBe(label15);
+            expect(nativeElement.groupRowPlaceholderNoValue).toBe(label15);
+        });
+
+        it('will use template string values for groupRowPlaceholderEmpty', () => {
+            expect(directive.groupRowPlaceholderEmpty).toBe(label16);
+            expect(nativeElement.groupRowPlaceholderEmpty).toBe(label16);
+        });
     });
 
     describe('with property bound values', () => {
@@ -257,6 +281,8 @@ describe('Nimble Label Provider Table', () => {
                     [rowSelect]="rowSelect"
                     [rowOperationColumn]="rowOperationColumn"
                     [rowLoading]="rowLoading"
+                    [groupRowPlaceholderNoValue]="groupRowPlaceholderNoValue"
+                    [groupRowPlaceholderEmpty]="groupRowPlaceholderEmpty"
                     >
                 </nimble-label-provider-table>
             `
@@ -278,6 +304,8 @@ describe('Nimble Label Provider Table', () => {
             public rowSelect = label1;
             public rowOperationColumn = label1;
             public rowLoading = label1;
+            public groupRowPlaceholderNoValue = label1;
+            public groupRowPlaceholderEmpty = label1;
         }
 
         let fixture: ComponentFixture<TestHostComponent>;
@@ -448,6 +476,28 @@ describe('Nimble Label Provider Table', () => {
             expect(directive.rowLoading).toBe(label2);
             expect(nativeElement.rowLoading).toBe(label2);
         });
+
+        it('can be configured with property binding for groupRowPlaceholderNoValue', () => {
+            expect(directive.groupRowPlaceholderNoValue).toBe(label1);
+            expect(nativeElement.groupRowPlaceholderNoValue).toBe(label1);
+
+            fixture.componentInstance.groupRowPlaceholderNoValue = label2;
+            fixture.detectChanges();
+
+            expect(directive.groupRowPlaceholderNoValue).toBe(label2);
+            expect(nativeElement.groupRowPlaceholderNoValue).toBe(label2);
+        });
+
+        it('can be configured with property binding for groupRowPlaceholderEmpty', () => {
+            expect(directive.groupRowPlaceholderEmpty).toBe(label1);
+            expect(nativeElement.groupRowPlaceholderEmpty).toBe(label1);
+
+            fixture.componentInstance.groupRowPlaceholderEmpty = label2;
+            fixture.detectChanges();
+
+            expect(directive.groupRowPlaceholderEmpty).toBe(label2);
+            expect(nativeElement.groupRowPlaceholderEmpty).toBe(label2);
+        });
     });
 
     describe('with attribute bound values', () => {
@@ -468,6 +518,8 @@ describe('Nimble Label Provider Table', () => {
                     [attr.row-select]="rowSelect"
                     [attr.row-operation-column]="rowOperationColumn"
                     [attr.row-loading]="rowLoading"
+                    [attr.group-row-placeholder-no-value]="groupRowPlaceholderNoValue"
+                    [attr.group-row-placeholder-empty]="groupRowPlaceholderEmpty"
                     >
                 </nimble-label-provider-table>
             `
@@ -489,6 +541,8 @@ describe('Nimble Label Provider Table', () => {
             public rowSelect = label1;
             public rowOperationColumn = label1;
             public rowLoading = label1;
+            public groupRowPlaceholderNoValue = label1;
+            public groupRowPlaceholderEmpty = label1;
         }
 
         let fixture: ComponentFixture<TestHostComponent>;
@@ -659,5 +713,27 @@ describe('Nimble Label Provider Table', () => {
             expect(directive.rowLoading).toBe(label2);
             expect(nativeElement.rowLoading).toBe(label2);
         });
+
+        it('can be configured with attribute binding for groupRowPlaceholderNoValue', () => {
+            expect(directive.groupRowPlaceholderNoValue).toBe(label1);
+            expect(nativeElement.groupRowPlaceholderNoValue).toBe(label1);
+
+            fixture.componentInstance.groupRowPlaceholderNoValue = label2;
+            fixture.detectChanges();
+
+            expect(directive.groupRowPlaceholderNoValue).toBe(label2);
+            expect(nativeElement.groupRowPlaceholderNoValue).toBe(label2);
+        });
+
+        it('can be configured with attribute binding for groupRowPlaceholderEmpty', () => {
+            expect(directive.groupRowPlaceholderEmpty).toBe(label1);
+            expect(nativeElement.groupRowPlaceholderEmpty).toBe(label1);
+
+            fixture.componentInstance.groupRowPlaceholderEmpty = label2;
+            fixture.detectChanges();
+
+            expect(directive.groupRowPlaceholderEmpty).toBe(label2);
+            expect(nativeElement.groupRowPlaceholderEmpty).toBe(label2);
+        });
     });
 });
diff --git a/angular-workspace/projects/ni/nimble-angular/package.json b/angular-workspace/projects/ni/nimble-angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-angular",
-  "version": "20.4.1",
+  "version": "20.5.0",
   "description": "Angular components for the NI Nimble Design System",
   "scripts": {
     "invoke-publish": "cd ../../../ && npm run build:library && cd dist/ni/nimble-angular && npm publish"
@@ -31,7 +31,7 @@
     "@angular/forms": "^15.2.10",
     "@angular/localize": "^15.2.10",
     "@angular/router": "^15.2.10",
-    "@ni/nimble-components": "^22.0.1"
+    "@ni/nimble-components": "^22.1.0"
   },
   "dependencies": {
     "tslib": "^2.2.0"

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/nimble-blazor/CHANGELOG.json b/packages/nimble-blazor/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@ni/nimble-blazor",
   "entries": [
+    {
+      "date": "Mon, 18 Mar 2024 17:12:34 GMT",
+      "version": "14.5.0",
+      "tag": "@ni/nimble-blazor_v14.5.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "20542556+mollykreis@users.noreply.github.com",
+            "package": "@ni/nimble-blazor",
+            "commit": "3bbf8d7cd86d0129e9ad6bb0eed245ea2bfc0fda",
+            "comment": "Add new properties to the table label provider"
+          }
+        ]
+      }
+    },
     {
       "date": "Wed, 13 Mar 2024 23:07:24 GMT",
       "version": "14.4.0",

diff --git a/packages/nimble-blazor/CHANGELOG.md b/packages/nimble-blazor/CHANGELOG.md
@@ -1,9 +1,17 @@
 # Change Log - @ni/nimble-blazor
 
-This log was last generated on Wed, 13 Mar 2024 23:07:24 GMT and should not be manually modified.
+This log was last generated on Mon, 18 Mar 2024 17:12:34 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 14.5.0
+
+Mon, 18 Mar 2024 17:12:34 GMT
+
+### Minor changes
+
+- Add new properties to the table label provider ([ni/nimble@3bbf8d7](https://github.com/ni/nimble/commit/3bbf8d7cd86d0129e9ad6bb0eed245ea2bfc0fda))
+
 ## 14.4.0
 
 Wed, 13 Mar 2024 23:07:24 GMT

diff --git a/packages/nimble-blazor/NimbleBlazor/Components/NimbleLabelProviderTable.razor b/packages/nimble-blazor/NimbleBlazor/Components/NimbleLabelProviderTable.razor
@@ -14,5 +14,7 @@
     row-select="@RowSelect"
     row-operation-column="@RowOperationColumn"
     row-loading="@RowLoading"
+    group-row-placeholder-no-value="@GroupRowPlaceholderNoValue"
+    group-row-placeholder-empty="@GroupRowPlaceholderEmpty"
     @attributes="AdditionalAttributes">
 </nimble-label-provider-table>
diff --git a/packages/nimble-blazor/NimbleBlazor/Components/NimbleLabelProviderTable.razor.cs b/packages/nimble-blazor/NimbleBlazor/Components/NimbleLabelProviderTable.razor.cs
@@ -49,6 +49,11 @@ public partial class NimbleLabelProviderTable : ComponentBase
     [Parameter]
     public string? RowLoading { get; set; }
 
+    [Parameter]
+    public string? GroupRowPlaceholderNoValue { get; set; }
+
+    [Parameter]
+    public string? GroupRowPlaceholderEmpty { get; set; }
     /// <summary>
     /// Gets or sets a collection of additional attributes that will be applied to the created element.
     /// </summary>

diff --git a/...s/nimble-blazor/Tests/NimbleBlazor.Tests/Unit/Components/NimbleLabelProviderTableTests.cs b/...s/nimble-blazor/Tests/NimbleBlazor.Tests/Unit/Components/NimbleLabelProviderTableTests.cs
@@ -44,6 +44,8 @@ public void NimbleLabelProviderTable_SupportsAdditionalAttributes()
     [InlineData(nameof(NimbleLabelProviderTable.RowSelect))]
     [InlineData(nameof(NimbleLabelProviderTable.RowOperationColumn))]
     [InlineData(nameof(NimbleLabelProviderTable.RowLoading))]
+    [InlineData(nameof(NimbleLabelProviderTable.GroupRowPlaceholderNoValue))]
+    [InlineData(nameof(NimbleLabelProviderTable.GroupRowPlaceholderEmpty))]
     public void NimbleLabelProviderTable_LabelIsSet(string propertyName)
     {
         var labelValue = propertyName + "UpdatedValue";

diff --git a/packages/nimble-blazor/package.json b/packages/nimble-blazor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-blazor",
-  "version": "14.4.1",
+  "version": "14.5.0",
   "description": "Blazor components for the NI Nimble Design System",
   "scripts": {
     "postinstall": "node build/generate-playwright-version-properties/source/index.js",