Merge branch 'main' into script-tweaks

ni · May 6, 2024 · f4ad7d4 · f4ad7d4
2 parents a444a3b + 92b3664
commit f4ad7d4
Show file tree

Hide file tree

Showing 70 changed files with 462 additions and 336 deletions.
diff --git a/angular-workspace/projects/example-client-app/src/app/app.module.ts b/angular-workspace/projects/example-client-app/src/app/app.module.ts
@@ -22,7 +22,7 @@ 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';
 import { NimbleTableColumnDateTextModule } from '@ni/nimble-angular/table-column/date-text';
-import { NimbleTableColumnIconModule } from '@ni/nimble-angular/table-column/icon';
+import { NimbleTableColumnMappingModule } from '@ni/nimble-angular/table-column/mapping';
 import { NimbleTableColumnNumberTextModule } from '@ni/nimble-angular/table-column/number-text';
 import { NimbleTableColumnDurationTextModule } from '@ni/nimble-angular/table-column/duration-text';
 import { NimbleRichTextViewerModule } from '@ni/nimble-angular/rich-text/viewer';
@@ -95,7 +95,7 @@ import { HeaderComponent } from './header/header.component';
         NimbleBannerModule,
         NimbleRichTextViewerModule,
         NimbleRichTextEditorModule,
-        NimbleTableColumnIconModule,
+        NimbleTableColumnMappingModule,
         NimbleMappingIconModule,
         NimbleMappingUserModule,
         NimbleRichTextMentionUsersModule,

diff --git a/angular-workspace/projects/example-client-app/src/app/customapp/customapp.component.html b/angular-workspace/projects/example-client-app/src/app/customapp/customapp.component.html
@@ -247,15 +247,15 @@
                 >
                     Date
                 </nimble-table-column-date-text>
-                <nimble-table-column-icon
+                <nimble-table-column-mapping
                     field-name="statusCode"
                     key-type="number"
                 >
                     <nimble-mapping-text key="100" text="Status message 1"></nimble-mapping-text>
                     <nimble-mapping-text key="101" text="Status message 2"></nimble-mapping-text>
                     Status
-                </nimble-table-column-icon>
-                <nimble-table-column-icon
+                </nimble-table-column-mapping>
+                <nimble-table-column-mapping
                     field-name="result"
                     key-type="string"
                     width-mode="icon-size"
@@ -273,7 +273,7 @@
                         text-hidden>
                     </nimble-mapping-spinner>
                     <nimble-icon-xmark-check title="Result"></nimble-icon-xmark-check>
-                </nimble-table-column-icon>
+                </nimble-table-column-mapping>
                 <nimble-table-column-number-text
                     field-name="number"
                 >

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, 06 May 2024 19:00:05 GMT",
+      "version": "24.0.0",
+      "tag": "@ni/nimble-angular_v24.0.0",
+      "comments": {
+        "major": [
+          {
+            "author": "20542556+mollykreis@users.noreply.github.com",
+            "package": "@ni/nimble-angular",
+            "commit": "d1c9125a77615d0364671a9e03a558c57b359ed7",
+            "comment": "Rename icon column to mapping column"
+          },
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v28.0.0",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Thu, 02 May 2024 18:52:31 GMT",
       "version": "23.2.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, 02 May 2024 18:52:31 GMT and should not be manually modified.
+This log was last generated on Mon, 06 May 2024 19:00:05 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 24.0.0
+
+Mon, 06 May 2024 19:00:05 GMT
+
+### Major changes
+
+- Rename icon column to mapping column ([ni/nimble@d1c9125](https://github.com/ni/nimble/commit/d1c9125a77615d0364671a9e03a558c57b359ed7))
+- Bump @ni/nimble-components to v28.0.0
+
 ## 23.2.1
 
 Thu, 02 May 2024 18:52:31 GMT

diff --git a/angular-workspace/projects/ni/nimble-angular/mapping/icon/nimble-mapping-icon.directive.ts b/angular-workspace/projects/ni/nimble-angular/mapping/icon/nimble-mapping-icon.directive.ts
@@ -9,7 +9,7 @@ export type { MappingIcon };
 export { mappingIconTag };
 
 /**
- * Directive to provide Angular integration for the mapping icon element used by the icon column.
+ * Directive to provide Angular integration for the mapping icon element used by the mapping column.
  */
 @Directive({
     selector: 'nimble-mapping-icon'

diff --git a/...space/projects/ni/nimble-angular/mapping/icon/tests/nimble-mapping-icon.directive.spec.ts b/...space/projects/ni/nimble-angular/mapping/icon/tests/nimble-mapping-icon.directive.spec.ts
@@ -2,15 +2,15 @@ import { Component, ElementRef, ViewChild } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { IconSeverity } from '@ni/nimble-angular';
 import { NimbleTableModule } from '../../../table/nimble-table.module';
-import { NimbleTableColumnIconModule } from '../../../table-column/icon/nimble-table-column-icon.module';
+import { NimbleTableColumnMappingModule } from '../../../table-column/mapping/nimble-table-column-mapping.module';
 import { NimbleMappingIconDirective, type MappingIcon } from '../nimble-mapping-icon.directive';
 import { NimbleMappingIconModule } from '../nimble-mapping-icon.module';
 
 describe('NimbleMappingIcon', () => {
     describe('module', () => {
         beforeEach(() => {
             TestBed.configureTestingModule({
-                imports: [NimbleMappingIconModule]
+                imports: [NimbleTableColumnMappingModule]
             });
         });
 
@@ -23,7 +23,7 @@ describe('NimbleMappingIcon', () => {
         @Component({
             template: `
                 <nimble-table>
-                    <nimble-table-column-icon key-type="boolean">
+                    <nimble-table-column-mapping key-type="boolean">
                         <nimble-mapping-icon
                             #mapping
                             key="false"
@@ -33,7 +33,7 @@ describe('NimbleMappingIcon', () => {
                             text-hidden
                         >
                         </nimble-mapping-icon>
-                    </nimble-table-column-icon>
+                    </nimble-table-column-mapping>
                 </nimble-table>
             `
         })
@@ -48,7 +48,7 @@ describe('NimbleMappingIcon', () => {
         beforeEach(() => {
             TestBed.configureTestingModule({
                 declarations: [TestHostComponent],
-                imports: [NimbleMappingIconModule, NimbleTableColumnIconModule, NimbleTableModule]
+                imports: [NimbleMappingIconModule, NimbleTableColumnMappingModule, NimbleTableModule]
             });
 
             fixture = TestBed.createComponent(TestHostComponent);
@@ -87,7 +87,7 @@ describe('NimbleMappingIcon', () => {
         @Component({
             template: `
                 <nimble-table>
-                    <nimble-table-column-icon key-type="boolean">
+                    <nimble-table-column-mapping key-type="boolean">
                         <nimble-mapping-icon
                             #mapping
                             [key]="key"
@@ -97,7 +97,7 @@ describe('NimbleMappingIcon', () => {
                             [textHidden]="textHidden"
                         >
                         </nimble-mapping-icon>
-                    </nimble-table-column-icon>
+                    </nimble-table-column-mapping>
                 </nimble-table>
             `
         })
@@ -117,7 +117,7 @@ describe('NimbleMappingIcon', () => {
         beforeEach(() => {
             TestBed.configureTestingModule({
                 declarations: [TestHostComponent],
-                imports: [NimbleMappingIconModule, NimbleTableColumnIconModule, NimbleTableModule]
+                imports: [NimbleMappingIconModule, NimbleTableColumnMappingModule, NimbleTableModule]
             });
 
             fixture = TestBed.createComponent(TestHostComponent);
@@ -186,7 +186,7 @@ describe('NimbleMappingIcon', () => {
         @Component({
             template: `
                 <nimble-table>
-                    <nimble-table-column-icon key-type="boolean">
+                    <nimble-table-column-mapping key-type="boolean">
                         <nimble-mapping-icon
                             #mapping
                             [attr.key]="key"
@@ -196,7 +196,7 @@ describe('NimbleMappingIcon', () => {
                             [attr.text-hidden]="textHidden"
                         >
                         </nimble-mapping-icon>
-                    </nimble-table-column-icon>
+                    </nimble-table-column-mapping>
                 </nimble-table>
             `
         })
@@ -216,7 +216,7 @@ describe('NimbleMappingIcon', () => {
         beforeEach(() => {
             TestBed.configureTestingModule({
                 declarations: [TestHostComponent],
-                imports: [NimbleMappingIconModule, NimbleTableColumnIconModule, NimbleTableModule]
+                imports: [NimbleMappingIconModule, NimbleTableColumnMappingModule, NimbleTableModule]
             });
 
             fixture = TestBed.createComponent(TestHostComponent);

diff --git a/...projects/ni/nimble-angular/mapping/spinner/tests/nimble-mapping-spinner.directive.spec.ts b/...projects/ni/nimble-angular/mapping/spinner/tests/nimble-mapping-spinner.directive.spec.ts
@@ -1,7 +1,7 @@
 import { Component, ElementRef, ViewChild } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { NimbleTableModule } from '../../../table/nimble-table.module';
-import { NimbleTableColumnIconModule } from '../../../table-column/icon/nimble-table-column-icon.module';
+import { NimbleTableColumnMappingModule } from '../../../table-column/mapping/nimble-table-column-mapping.module';
 import { NimbleMappingSpinnerDirective, type MappingSpinner } from '../nimble-mapping-spinner.directive';
 import { NimbleMappingSpinnerModule } from '../nimble-mapping-spinner.module';
 
@@ -22,15 +22,15 @@ describe('NimbleMappingSpinner', () => {
         @Component({
             template: `
                 <nimble-table>
-                    <nimble-table-column-icon key-type="boolean">
+                    <nimble-table-column-mapping key-type="boolean">
                         <nimble-mapping-spinner
                             #mapping
                             key="false"
                             text="nope"
                             text-hidden
                         >
                         </nimble-mapping-spinner>
-                    </nimble-table-column-icon>
+                    </nimble-table-column-mapping>
                 </nimble-table>
             `
         })
@@ -45,7 +45,7 @@ describe('NimbleMappingSpinner', () => {
         beforeEach(() => {
             TestBed.configureTestingModule({
                 declarations: [TestHostComponent],
-                imports: [NimbleMappingSpinnerModule, NimbleTableColumnIconModule, NimbleTableModule]
+                imports: [NimbleMappingSpinnerModule, NimbleTableColumnMappingModule, NimbleTableModule]
             });
 
             fixture = TestBed.createComponent(TestHostComponent);
@@ -74,15 +74,15 @@ describe('NimbleMappingSpinner', () => {
         @Component({
             template: `
                 <nimble-table>
-                    <nimble-table-column-icon key-type="boolean">
+                    <nimble-table-column-mapping key-type="boolean">
                         <nimble-mapping-spinner
                             #mapping
                             [key]="key"
                             [text]="text"
                             [textHidden]="textHidden"
                         >
                         </nimble-mapping-spinner>
-                    </nimble-table-column-icon>
+                    </nimble-table-column-mapping>
                 </nimble-table>
             `
         })
@@ -100,7 +100,7 @@ describe('NimbleMappingSpinner', () => {
         beforeEach(() => {
             TestBed.configureTestingModule({
                 declarations: [TestHostComponent],
-                imports: [NimbleMappingSpinnerModule, NimbleTableColumnIconModule, NimbleTableModule]
+                imports: [NimbleMappingSpinnerModule, NimbleTableColumnMappingModule, NimbleTableModule]
             });
 
             fixture = TestBed.createComponent(TestHostComponent);
@@ -147,15 +147,15 @@ describe('NimbleMappingSpinner', () => {
         @Component({
             template: `
                 <nimble-table>
-                    <nimble-table-column-icon key-type="boolean">
+                    <nimble-table-column-mapping key-type="boolean">
                         <nimble-mapping-spinner
                             #mapping
                             [attr.key]="key"
                             [attr.text]="text"
                             [attr.text-hidden]="textHidden"
                         >
                         </nimble-mapping-spinner>
-                    </nimble-table-column-icon>
+                    </nimble-table-column-mapping>
                 </nimble-table>
             `
         })
@@ -173,7 +173,7 @@ describe('NimbleMappingSpinner', () => {
         beforeEach(() => {
             TestBed.configureTestingModule({
                 declarations: [TestHostComponent],
-                imports: [NimbleMappingSpinnerModule, NimbleTableColumnIconModule, NimbleTableModule]
+                imports: [NimbleMappingSpinnerModule, NimbleTableColumnMappingModule, NimbleTableModule]
             });
 
             fixture = TestBed.createComponent(TestHostComponent);

diff --git a/angular-workspace/projects/ni/nimble-angular/mapping/text/nimble-mapping-text.directive.ts b/angular-workspace/projects/ni/nimble-angular/mapping/text/nimble-mapping-text.directive.ts
@@ -7,7 +7,7 @@ export type { MappingText, MappingKey };
 export { mappingTextTag };
 
 /**
- * Directive to provide Angular integration for the mapping text element used by the icon column.
+ * Directive to provide Angular integration for the mapping text element used by the mapping column.
  */
 @Directive({
     selector: 'nimble-mapping-text'

diff --git a/...space/projects/ni/nimble-angular/mapping/text/tests/nimble-mapping-text.directive.spec.ts b/...space/projects/ni/nimble-angular/mapping/text/tests/nimble-mapping-text.directive.spec.ts
@@ -1,7 +1,7 @@
 import { Component, ElementRef, ViewChild } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { NimbleTableModule } from '../../../table/nimble-table.module';
-import { NimbleTableColumnIconModule } from '../../../table-column/icon/nimble-table-column-icon.module';
+import { NimbleTableColumnMappingModule } from '../../../table-column/mapping/nimble-table-column-mapping.module';
 import { NimbleMappingTextDirective, type MappingText } from '../nimble-mapping-text.directive';
 import { NimbleMappingTextModule } from '../nimble-mapping-text.module';
 
@@ -22,14 +22,14 @@ describe('NimbleMappingText', () => {
         @Component({
             template: `
                 <nimble-table>
-                    <nimble-table-column-icon key-type="boolean">
+                    <nimble-table-column-mapping key-type="boolean">
                         <nimble-mapping-text
                             #mapping
                             key="false"
                             text="nope"
                         >
                         </nimble-mapping-text>
-                    </nimble-table-column-icon>
+                    </nimble-table-column-mapping>
                 </nimble-table>
             `
         })
@@ -44,7 +44,7 @@ describe('NimbleMappingText', () => {
         beforeEach(() => {
             TestBed.configureTestingModule({
                 declarations: [TestHostComponent],
-                imports: [NimbleMappingTextModule, NimbleTableColumnIconModule, NimbleTableModule]
+                imports: [NimbleMappingTextModule, NimbleTableColumnMappingModule, NimbleTableModule]
             });
 
             fixture = TestBed.createComponent(TestHostComponent);
@@ -68,14 +68,14 @@ describe('NimbleMappingText', () => {
         @Component({
             template: `
                 <nimble-table>
-                    <nimble-table-column-icon key-type="boolean">
+                    <nimble-table-column-mapping key-type="boolean">
                         <nimble-mapping-text
                             #mapping
                             [key]="key"
                             [text]="text"
                         >
                         </nimble-mapping-text>
-                    </nimble-table-column-icon>
+                    </nimble-table-column-mapping>
                 </nimble-table>
             `
         })
@@ -92,7 +92,7 @@ describe('NimbleMappingText', () => {
         beforeEach(() => {
             TestBed.configureTestingModule({
                 declarations: [TestHostComponent],
-                imports: [NimbleMappingTextModule, NimbleTableColumnIconModule, NimbleTableModule]
+                imports: [NimbleMappingTextModule, NimbleTableColumnMappingModule, NimbleTableModule]
             });
 
             fixture = TestBed.createComponent(TestHostComponent);
@@ -128,14 +128,14 @@ describe('NimbleMappingText', () => {
         @Component({
             template: `
                 <nimble-table>
-                    <nimble-table-column-icon key-type="boolean">
+                    <nimble-table-column-mapping key-type="boolean">
                         <nimble-mapping-text
                             #mapping
                             [attr.key]="key"
                             [attr.text]="text"
                         >
                         </nimble-mapping-text>
-                    </nimble-table-column-icon>
+                    </nimble-table-column-mapping>
                 </nimble-table>
             `
         })
@@ -152,7 +152,7 @@ describe('NimbleMappingText', () => {
         beforeEach(() => {
             TestBed.configureTestingModule({
                 declarations: [TestHostComponent],
-                imports: [NimbleMappingTextModule, NimbleTableColumnIconModule, NimbleTableModule]
+                imports: [NimbleMappingTextModule, NimbleTableColumnMappingModule, NimbleTableModule]
             });
 
             fixture = TestBed.createComponent(TestHostComponent);