NAS-133694: Update usage of system.product_type (#11367)

src/app/enums/product-type.enum.ts

@@ -1,9 +1,9 @@
 export enum ProductType {
-  Scale = 'SCALE',
-  ScaleEnterprise = 'SCALE_ENTERPRISE',
+  CommunityEdition = 'COMMUNITY_EDITION',
+  Enterprise = 'ENTERPRISE',
 }
 
 export const productTypeLabels = new Map<ProductType, string>([
-  [ProductType.Scale, ''],
-  [ProductType.ScaleEnterprise, 'ENTERPRISE'],
+  [ProductType.CommunityEdition, ''],
+  [ProductType.Enterprise, 'ENTERPRISE'],
 ]);

src/app/modules/feedback/services/feedback.service.spec.ts

@@ -50,7 +50,7 @@ describe('FeedbackService', () => {
         selectors: [
           {
             selector: selectProductType,
-            value: ProductType.ScaleEnterprise,
+            value: ProductType.Enterprise,
           },
           {
             selector: selectSystemInfoState,
@@ -75,7 +75,7 @@ describe('FeedbackService', () => {
       }),
       mockProvider(MatSnackBar),
       mockProvider(SystemGeneralService, {
-        getProductType: jest.fn(() => ProductType.ScaleEnterprise),
+        getProductType: jest.fn(() => ProductType.Enterprise),
       }),
       mockWindow({
         location: {
@@ -289,7 +289,7 @@ describe('FeedbackService', () => {
         message: 'Git gud',
         page: '/storage',
         product_model: 'M40',
-        product_type: ProductType.ScaleEnterprise,
+        product_type: ProductType.Enterprise,
         rating: 1,
         release: 'SCALE-24.04',
         user_agent: 'Safari',
@@ -314,7 +314,7 @@ describe('FeedbackService', () => {
         message: 'Git gud',
         page: '/storage',
         product_model: 'M40',
-        product_type: ProductType.ScaleEnterprise,
+        product_type: ProductType.Enterprise,
         rating: 1,
         release: 'SCALE-24.04',
         user_agent: 'Safari',
@@ -348,7 +348,7 @@ describe('FeedbackService', () => {
         message: 'Git gud',
         page: '/storage',
         product_model: 'M40',
-        product_type: ProductType.ScaleEnterprise,
+        product_type: ProductType.Enterprise,
         rating: 5,
         release: 'SCALE-24.04',
         user_agent: 'Safari',

src/app/pages/dashboard/widgets/system/widget-sys-info-active/widget-sys-info-active.component.spec.ts

@@ -72,7 +72,7 @@ describe('WidgetSysInfoActiveComponent', () => {
         selectors: [
           {
             selector: selectProductType,
-            value: ProductType.ScaleEnterprise,
+            value: ProductType.Enterprise,
           },
           {
             selector: selectIsEnterprise,

src/app/pages/dashboard/widgets/system/widget-sys-info-passive/widget-sys-info-passive.component.spec.ts

@@ -66,7 +66,7 @@ describe('WidgetSysInfoPassiveComponent', () => {
         selectors: [
           {
             selector: selectProductType,
-            value: ProductType.ScaleEnterprise,
+            value: ProductType.Enterprise,
           },
           {
             selector: selectIsEnterprise,

src/app/pages/datasets/components/dataset-form/sections/other-options-section/other-options-section.component.spec.ts

@@ -194,7 +194,7 @@ describe('OtherOptionsSectionComponent', () => {
         mockCall('pool.dataset.recommended_zvol_blocksize', '256K' as DatasetRecordSize),
       ]),
       mockProvider(SystemGeneralService, {
-        getProductType: jest.fn(() => ProductType.Scale),
+        getProductType: jest.fn(() => ProductType.CommunityEdition),
       }),
       mockProvider(DialogService, {
         confirm: jest.fn(() => of(true)),
@@ -409,7 +409,7 @@ describe('OtherOptionsSectionComponent', () => {
 
     it('does not show deduplication field on Enterprise systems that do not have a dedup license', async () => {
       const systemGeneralService = spectator.inject(SystemGeneralService);
-      jest.spyOn(systemGeneralService, 'getProductType').mockReturnValue(ProductType.ScaleEnterprise);
+      jest.spyOn(systemGeneralService, 'getProductType').mockReturnValue(ProductType.Enterprise);
       const store$ = spectator.inject(MockStore);
       store$.overrideSelector(selectSystemInfo, {
         license: {

src/app/pages/datasets/components/dataset-form/sections/other-options-section/other-options-section.component.ts

@@ -227,7 +227,7 @@ export class OtherOptionsSectionComponent implements OnInit, OnChanges {
     this.hasDeduplication = false;
     this.cdr.markForCheck();
 
-    if (this.systemGeneralService.getProductType() !== ProductType.ScaleEnterprise) {
+    if (this.systemGeneralService.getProductType() !== ProductType.Enterprise) {
       this.hasDeduplication = true;
       this.cdr.markForCheck();
       return;

src/app/pages/network/components/configuration/configuration.component.ts

@@ -259,7 +259,7 @@ export class NetworkConfigurationComponent implements OnInit {
       },
     );
 
-    if (this.systemGeneralService.getProductType() === ProductType.ScaleEnterprise) {
+    if (this.systemGeneralService.getProductType() === ProductType.Enterprise) {
       this.store$.select(selectIsHaLicensed).pipe(untilDestroyed(this)).subscribe((isHaLicensed) => {
         this.hostnameB.hidden = !isHaLicensed;
         this.hostnameVirtual.hidden = !isHaLicensed;

src/app/pages/network/components/interface-form/interface-form.component.spec.ts

@@ -137,7 +137,7 @@ describe('InterfaceFormComponent', () => {
         components$: of([]),
       }),
       mockProvider(SystemGeneralService, {
-        getProductType: () => ProductType.ScaleEnterprise,
+        getProductType: () => ProductType.Enterprise,
       }),
       mockProvider(SlideInRef, slideInRef),
       mockAuth(),

src/app/pages/network/components/interface-form/interface-form.component.ts

@@ -324,7 +324,7 @@ export class InterfaceFormComponent implements OnInit {
   }
 
   private loadFailoverStatus(): void {
-    if (this.systemGeneralService.getProductType() !== ProductType.ScaleEnterprise) {
+    if (this.systemGeneralService.getProductType() !== ProductType.Enterprise) {
       return;
     }
 

src/app/pages/network/components/ipmi-card/ipmi-form/ipmi-form.component.spec.ts

@@ -123,7 +123,7 @@ describe('IpmiFormComponent', () => {
 
   describe('product type is SCALE_ENTERPRISE', () => {
     beforeEach(async () => {
-      await setupTest(ProductType.ScaleEnterprise);
+      await setupTest(ProductType.Enterprise);
     });
 
     it('loads data with controller radio buttons in the form for ScaleEnterprise', async () => {
@@ -219,7 +219,7 @@ describe('IpmiFormComponent', () => {
 
   describe('product type is SCALE', () => {
     beforeEach(async () => {
-      await setupTest(ProductType.Scale);
+      await setupTest(ProductType.CommunityEdition);
     });
 
     it('loads data in the form if the product type is SCALE', async () => {
@@ -238,7 +238,7 @@ describe('IpmiFormComponent', () => {
 
   describe('IPMI lights', () => {
     beforeEach(async () => {
-      await setupTest(ProductType.ScaleEnterprise);
+      await setupTest(ProductType.Enterprise);
     });
 
     it('flashes IPMI light when Flash Identify Light is pressed', async () => {

src/app/pages/network/components/ipmi-card/ipmi-form/ipmi-form.component.ts

@@ -308,7 +308,7 @@ export class IpmiFormComponent implements OnInit {
   }
 
   private loadFailoverData(): Observable<unknown> {
-    if (this.systemGeneralService.getProductType() !== ProductType.ScaleEnterprise) {
+    if (this.systemGeneralService.getProductType() !== ProductType.Enterprise) {
       return of(null);
     }
 

src/app/pages/network/network.component.ts

@@ -132,7 +132,7 @@ export class NetworkComponent implements OnInit {
         this.cdr.markForCheck();
       });
 
-    if (this.systemGeneralService.getProductType() === ProductType.ScaleEnterprise) {
+    if (this.systemGeneralService.getProductType() === ProductType.Enterprise) {
       this.listenForHaStatus();
     }
 

src/app/pages/network/tests/checkin.spec.ts

@@ -125,7 +125,7 @@ describe('NetworkComponent', () => {
         confirm: jest.fn(() => of(true)),
       }),
       mockProvider(SystemGeneralService, {
-        getProductType$: of(ProductType.Scale),
+        getProductType$: of(ProductType.CommunityEdition),
       }),
       mockProvider(SlideInRef, slideInRef),
       mockProvider(SlideIn, {

src/app/pages/system/advanced/advanced-settings.component.spec.ts

@@ -70,7 +70,7 @@ describe('AdvancedSettingsComponent', () => {
       provideMockStore({
         selectors: [{
           selector: selectProductType,
-          value: ProductType.Scale,
+          value: ProductType.CommunityEdition,
         }],
       }),
     ],
@@ -100,7 +100,7 @@ describe('AdvancedSettingsComponent', () => {
 
   it('enterprise: shows cards with advanced settings', () => {
     const store$ = spectator.inject(MockStore);
-    store$.overrideSelector(selectProductType, ProductType.ScaleEnterprise);
+    store$.overrideSelector(selectProductType, ProductType.Enterprise);
     store$.refreshState();
 
     spectator.detectChanges();

src/app/pages/system/advanced/system-security/system-security-form/system-security-form.component.spec.ts

@@ -47,7 +47,7 @@ describe('SystemSecurityFormComponent', () => {
       }),
       mockProvider(SnackbarService),
       mockProvider(SystemGeneralService, {
-        getProductType: () => ProductType.Scale,
+        getProductType: () => ProductType.CommunityEdition,
       }),
       mockProvider(SlideInRef, {
         close: jest.fn(),

src/app/pages/system/general-settings/email/email-form/email-form.component.spec.ts

@@ -77,7 +77,7 @@ describe('EmailFormComponent', () => {
       }),
       mockProvider(SnackbarService),
       mockProvider(SystemGeneralService, {
-        getProductType: () => ProductType.Scale,
+        getProductType: () => ProductType.CommunityEdition,
       }),
       mockWindow({
         open: jest.fn(),
@@ -201,7 +201,7 @@ describe('EmailFormComponent', () => {
         [
           {
             subject: 'Test Message',
-            text: 'This is a test message from TrueNAS SCALE.',
+            text: 'This is a test message from TrueNAS COMMUNITY EDITION.',
           },
           {
             fromemail: 'from@ixsystems.com',
@@ -310,7 +310,7 @@ describe('EmailFormComponent', () => {
         [
           {
             subject: 'Test Message',
-            text: 'This is a test message from TrueNAS SCALE.',
+            text: 'This is a test message from TrueNAS COMMUNITY EDITION.',
           },
           {
             fromemail: 'from@ixsystems.com',
@@ -393,7 +393,7 @@ describe('EmailFormComponent', () => {
         [
           {
             subject: 'Test Message',
-            text: 'This is a test message from TrueNAS SCALE.',
+            text: 'This is a test message from TrueNAS COMMUNITY EDITION.',
           },
           {
             fromemail: 'from@ixsystems.com',

src/app/pages/system/general-settings/email/email-form/email-form.component.ts

@@ -241,7 +241,7 @@ export class EmailFormComponent implements OnInit {
     const productType = this.systemGeneralService.getProductType();
     const email = {
       subject: 'Test Message',
-      text: `This is a test message from TrueNAS ${productType}.`,
+      text: `This is a test message from TrueNAS ${productType.replace('_', ' ')}.`,
     };
     const config = this.prepareConfigUpdate();
 

src/app/pages/system/general-settings/support/support-card/support-card.component.spec.ts

@@ -49,7 +49,7 @@ describe('SupportCardComponent', () => {
       mockApi([
         mockCall('truenas.is_production', true),
         mockJob('truenas.set_production', fakeSuccessfulJob()),
-        mockCall('system.product_type', ProductType.Scale),
+        mockCall('system.product_type', ProductType.CommunityEdition),
       ]),
       provideMockStore({
         selectors: [

src/app/pages/system/update/components/manual-update-form/manual-update-form.component.spec.ts

@@ -54,7 +54,7 @@ describe('ManualUpdateFormComponent', () => {
       }),
       mockWindow({
         localStorage: {
-          getItem: () => ProductType.ScaleEnterprise,
+          getItem: () => ProductType.Enterprise,
         },
       }),
       provideMockStore({

src/app/services/navigation/navigation.service.ts

@@ -82,7 +82,7 @@ export class NavigationService {
         {
           name: 'KMIP',
           state: 'kmip',
-          isVisible$: of(this.systemGeneralService.getProductType() === ProductType.ScaleEnterprise),
+          isVisible$: of(this.systemGeneralService.getProductType() === ProductType.Enterprise),
         },
       ],
     },
@@ -149,7 +149,7 @@ export class NavigationService {
   }
 
   private checkForEnterpriseLicenses(): void {
-    if (this.systemGeneralService.getProductType() !== ProductType.ScaleEnterprise) {
+    if (this.systemGeneralService.getProductType() !== ProductType.Enterprise) {
       this.hasVms$.next(true);
       this.hasApps$.next(true);
       return;

src/app/services/system-general.service.ts

@@ -27,7 +27,7 @@ export class SystemGeneralService {
    * Use selectIsEnterprise selector instead
    */
   get isEnterprise(): boolean {
-    return this.getProductType() === ProductType.ScaleEnterprise;
+    return this.getProductType() === ProductType.Enterprise;
   }
 
   /**
@@ -58,7 +58,7 @@ export class SystemGeneralService {
    * Use selectIsEnterprise selector instead
    */
   readonly isEnterprise$ = this.getProductType$.pipe(
-    map((productType) => productType === ProductType.ScaleEnterprise),
+    map((productType) => productType === ProductType.Enterprise),
     shareReplay({ refCount: true, bufferSize: 1 }),
   );
 

src/app/store/eula/eula.effects.spec.ts

@@ -31,7 +31,7 @@ describe('EulaEffects', () => {
       provideMockStore({
         selectors: [{
           selector: selectProductType,
-          value: ProductType.ScaleEnterprise,
+          value: ProductType.Enterprise,
         }],
       }),
       mockAuth(),

src/app/store/system-info/system-info.effects.ts

@@ -50,7 +50,7 @@ export class SystemInfoEffects {
         map((productType) => productTypeLoaded({ productType })),
         catchError((error: unknown) => {
           console.error(error);
-          return of(productTypeLoaded({ productType: ProductType.Scale }));
+          return of(productTypeLoaded({ productType: ProductType.CommunityEdition }));
         }),
       );
     }),

src/app/store/system-info/system-info.reducer.ts

@@ -16,7 +16,7 @@ export interface SystemInfoState {
 
 const initialState: SystemInfoState = {
   systemInfo: null,
-  productType: ProductType.Scale,
+  productType: ProductType.CommunityEdition,
   isIxHardware: false,
   buildYear: environment.buildYear,
 };

src/app/store/system-info/system-info.selectors.ts

@@ -30,7 +30,7 @@ export const selectProductType = createSelector(
 
 export const selectIsEnterprise = createSelector(
   selectProductType,
-  (productType) => productType === ProductType.ScaleEnterprise,
+  (productType) => productType === ProductType.Enterprise,
 );
 
 export const selectBuildYear = createSelector(