@memberjunction/ng-explorer-core 6.2.0-edge.5 → 6.2.0-edge.7

package/dist/lib/shell/components/tabs/tab-container.component.js

@@ -1,7 +1,7 @@
 import { Component, ViewChild, runInInjectionContext, createComponent, ViewEncapsulation, HostListener, Output, EventEmitter, inject } from '@angular/core';
 import { GoldenLayoutManager, FlattenLayoutToSingleStack, TabService } from '@memberjunction/ng-base-application';
 import { MJGlobal } from '@memberjunction/global';
-import { BaseResourceComponent, HomeAppPinService, NavigationService, IsRecordTabsStyle, IsRecordsTabConfiguration, IsRecordsRegionTab, IsRecordDockedToWorkspace, RECORD_DOCKED_TO_WORKSPACE_KEY, GetRecordSourceContext, SafeDetectChanges, ExplorerBreakpointService, ResolveRecordTypeIcon, GetDeletedRecordFromEvent, RecordTabShowsRecord, RemoveDeletedRecordFromOrigin, OriginToTabConfiguration, OriginHasReturnTarget, NormalizeRecordIdForMatch } from '@memberjunction/ng-shared';
+import { BaseResourceComponent, HomeAppPinService, NavigationService, IsRecordTabsStyle, IsRecordsTabConfiguration, IsRecordsRegionTab, IsRecordDockedToWorkspace, RECORD_DOCKED_TO_WORKSPACE_KEY, GetRecordSourceContext, SafeDetectChanges, ExplorerBreakpointService, ResolveRecordTypeIcon, ResolveRecordTabDisplayTitle, GetDeletedRecordFromEvent, RecordTabShowsRecord, RemoveDeletedRecordFromOrigin, OriginToTabConfiguration, OriginHasReturnTarget, NormalizeRecordIdForMatch } from '@memberjunction/ng-shared';
 import { ResourceData, ResourcePermissionEngine } from '@memberjunction/core-entities';
 import { RecordOriginCrumbComponent } from '../record-open/record-origin-crumb.component';
 import { RecordSwitcherService } from '../record-open/record-switcher.service';
@@ -419,7 +419,7 @@ export class TabContainerComponent extends BaseAngularComponent {
         const activeTab = config.tabs.find(t => t.id === config.activeTabId);
         if (activeTab && this.isRecordTab(activeTab)) {
             const app = this.appManager.GetAppById(activeTab.applicationId);
-            this.RecordBarTitle = activeTab.title;
+            this.RecordBarTitle = this.resolveTabTitle(activeTab);
             this.RecordBarIcon = ResolveRecordTypeIcon(activeTab.configuration, this.ProviderToUse);
             this.RecordBarColor = app?.GetColor() || DEFAULT_APP_COLOR;
         }
@@ -446,13 +446,16 @@ export class TabContainerComponent extends BaseAngularComponent {
             : null;
         return {
             TabId: tab.id,
-            Title: tab.title,
+            Title: this.resolveTabTitle(tab),
             Icon: ResolveRecordTypeIcon(tab.configuration, this.ProviderToUse),
             Color: app?.GetColor() || DEFAULT_APP_COLOR,
             OriginLabel: originLabel,
             IsActive: tab.id === activeTabId
         };
     }
+    resolveTabTitle(tab) {
+        return ResolveRecordTabDisplayTitle(tab, this.ProviderToUse) || tab.title;
+    }
     /** True while the RECORDS region is the visible surface (active tab is a record) */
     ShowRecordsRegion = false;
     /**
@@ -549,7 +552,7 @@ export class TabContainerComponent extends BaseAngularComponent {
                 const app = this.appManager.GetAppById(tab.applicationId);
                 this.recordsLayoutManager.UpdateTabStyle(tab.id, {
                     isPinned: tab.isPinned,
-                    title: tab.title,
+                    title: this.resolveTabTitle(tab),
                     appColor: app?.GetColor() || DEFAULT_APP_COLOR,
                     typeIcon: this.resolveTabTypeIcon(tab)
                 });
@@ -842,7 +845,7 @@ export class TabContainerComponent extends BaseAngularComponent {
             tabId: tab.id,
             appId: tab.applicationId,
             appColor: app?.GetColor() || DEFAULT_APP_COLOR,
-            title: tab.title,
+            title: this.resolveTabTitle(tab),
             route: tab.configuration['route'] || '',
             isPinned: tab.isPinned,
             isLoaded: false,
@@ -1465,7 +1468,7 @@ export class TabContainerComponent extends BaseAngularComponent {
         const driverClass = resourceData.Configuration?.resourceTypeDriverClass || resourceData.ResourceType;
         // Entity name discriminates between "new record" tabs of different entities (all
         // have empty ResourceRecordID otherwise). For non-Records resources this is undefined.
-        const cacheDiscriminator = resourceData.Configuration?.Entity;
+        const cacheDiscriminator = this.resolveCacheDiscriminator(resourceData.Configuration);
         // **OPTIMIZATION: Check cache first to reuse existing loaded component**
         const cached = this.cacheManager.getCachedComponent(driverClass, resourceData.ResourceRecordID || '', activeTab.applicationId, cacheDiscriminator);
         if (cached) {
@@ -1893,13 +1896,15 @@ export class TabContainerComponent extends BaseAngularComponent {
         // IMPORTANT: Check both resourceRecordId AND configuration.recordId
         // because for nav items, the recordId is stored in configuration, not resourceRecordId
         const effectiveRecordId = tab.resourceRecordId || tab.configuration?.recordId || '';
+        const effectiveAbv = tab.configuration?.['AlternateBaseView'] || tab.configuration?.['alternateBaseView'] || '';
         const parts = [
             tab.applicationId,
             tab.configuration?.resourceType || '',
             tab.configuration?.driverClass || '',
             tab.configuration?.Entity || '', // Include Entity name for Records resource type
             effectiveRecordId,
-            tab.configuration?.route || ''
+            tab.configuration?.route || '',
+            effectiveAbv
         ];
         return parts.join('|');
     }
@@ -1913,7 +1918,7 @@ export class TabContainerComponent extends BaseAngularComponent {
             tabId: tab.id,
             appId: tab.applicationId,
             appColor,
-            title: tab.title,
+            title: this.resolveTabTitle(tab),
             route: tab.configuration['route'] || '',
             isPinned: tab.isPinned,
             isLoaded: false,
@@ -2018,7 +2023,7 @@ export class TabContainerComponent extends BaseAngularComponent {
             const driverClass = resourceData.Configuration?.resourceTypeDriverClass || resourceData.ResourceType;
             // Discriminate distinct "new record" tabs of different entities (all have empty
             // ResourceRecordID otherwise — would silently collide in the cache).
-            const cacheDiscriminator = resourceData.Configuration?.Entity;
+            const cacheDiscriminator = this.resolveCacheDiscriminator(resourceData.Configuration);
             // Check if we have a cached component for this resource
             const cached = this.cacheManager.getCachedComponent(driverClass, resourceData.ResourceRecordID || '', tab.applicationId, cacheDiscriminator);
             if (cached) {
@@ -2513,6 +2518,8 @@ export class TabContainerComponent extends BaseAngularComponent {
                     // reload from being handed back the component it just detached.
                     const existingEntity = existingResourceData?.Configuration?.Entity;
                     const newEntity = tab.configuration['Entity'];
+                    const existingAbv = (existingResourceData?.Configuration?.['AlternateBaseView'] ?? existingResourceData?.Configuration?.['alternateBaseView']) || '';
+                    const newAbv = (tab.configuration['AlternateBaseView'] ?? tab.configuration['alternateBaseView']) || '';
                     // The record id comparison accepts the URL-segment form ResourceRecordSaved writes into
                     // the component's Data ('ID|<uuid>' for a tab that keeps '<uuid>'). An exact comparison
                     // reloads the same cached component on every configuration emission, and each reload
@@ -2521,6 +2528,7 @@ export class TabContainerComponent extends BaseAngularComponent {
                         existingResourceData?.Configuration?.applicationId !== tab.applicationId ||
                         !TabContainerComponent.IsSameRecordId(existingRecordId, newRecordId) ||
                         existingEntity !== newEntity ||
+                        existingAbv !== newAbv ||
                         (tab.configuration['resourceType'] === 'Custom' && existingDriverClass !== newDriverClass);
                     if (needsReload) {
                         // Clean up old component
@@ -2548,7 +2556,7 @@ export class TabContainerComponent extends BaseAngularComponent {
                 const app = this.appManager.GetAppById(tab.applicationId);
                 const styleUpdate = {
                     isPinned: tab.isPinned,
-                    title: tab.title,
+                    title: this.resolveTabTitle(tab),
                     appColor: app?.GetColor() || DEFAULT_APP_COLOR
                 };
                 if (IsRecordsTabConfiguration(tab.configuration)) {
@@ -3032,6 +3040,26 @@ export class TabContainerComponent extends BaseAngularComponent {
         // Unblock the shell's first-load gate so the loading overlay clears.
         this.emitFirstLoadCompleteOnce();
     }
+    resolveCacheDiscriminator(configuration) {
+        if (typeof ComponentCacheManager.GetCacheDiscriminator === 'function') {
+            return ComponentCacheManager.GetCacheDiscriminator(configuration);
+        }
+        if (!configuration) {
+            return undefined;
+        }
+        const entity = typeof configuration['Entity'] === 'string' && configuration['Entity'].trim().length > 0
+            ? configuration['Entity'].trim()
+            : '';
+        const rawAbv = configuration['AlternateBaseView'];
+        const abv = typeof rawAbv === 'string' && rawAbv.trim().length > 0 ? rawAbv.trim() : '';
+        if (!entity && !abv) {
+            return undefined;
+        }
+        if (entity && abv) {
+            return `${entity}|abv:${abv}`;
+        }
+        return entity || `abv:${abv}`;
+    }
     static ɵfac = function TabContainerComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || TabContainerComponent)(i0.ɵɵdirectiveInject(i1.GoldenLayoutManager), i0.ɵɵdirectiveInject(i1.WorkspaceStateManager), i0.ɵɵdirectiveInject(i1.ApplicationManager), i0.ɵɵdirectiveInject(i0.ApplicationRef), i0.ɵɵdirectiveInject(i0.EnvironmentInjector), i0.ɵɵdirectiveInject(i0.ChangeDetectorRef)); };
     static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: TabContainerComponent, selectors: [["mj-tab-container"]], viewQuery: function TabContainerComponent_Query(rf, ctx) { if (rf & 1) {
             i0.ɵɵviewQuery(_c0, 5)(_c1, 5)(_c2, 5);