@contrail/flexplm 1.7.4-alpha.879820c → 1.7.4-alpha.8ba0056

package/lib/interfaces/item-family-changes.d.ts

@@ -12,7 +12,6 @@ export declare class ItemFamilyChanges {
     colorDeletes: string[];
     colorUpdates: string[];
     colorUnchanged: string[];
-    colorSuppressed: string[];
     assortmentItemFullChangeMap: Map<string, any>;
     assortmentItemDeleteMap: Map<string, any>;
     itemToFederatedIdMapping: Map<string, string>;

package/lib/interfaces/item-family-changes.js

@@ -14,7 +14,6 @@ class ItemFamilyChanges {
         this.colorDeletes = [];
         this.colorUpdates = [];
         this.colorUnchanged = [];
-        this.colorSuppressed = []; // changed this window, but excluded by the lifecycle filter
         this.assortmentItemFullChangeMap = new Map();
         this.assortmentItemDeleteMap = new Map();
         this.itemToFederatedIdMapping = new Map();
@@ -33,7 +32,6 @@ class ItemFamilyChanges {
         s += ' colorDeletes: [' + this.colorDeletes + ']\n';
         s += ' colorUpdates: [' + this.colorUpdates + ']\n';
         s += ' colorUnchanged: [' + this.colorUnchanged + ']\n';
-        s += ' colorSuppressed: [' + this.colorSuppressed + ']\n';
         s += 'assortmentItemFullChangeMap:\n';
         s += 'size: ' + this.assortmentItemFullChangeMap.size + '\n[';
         for (const key of this.assortmentItemFullChangeMap.keys()) {

package/lib/publish/base-process-publish-assortment.js

@@ -493,15 +493,18 @@ class BaseProcessPublishAssortment {
             const item = aItem?.item;
             const itemId = item?.id;
             const itemFamilyId = item?.itemFamilyId;
+            // ET-243: meets criteria is separated out for itemId and familyId separately
             if (meetsCriteria) {
                 releasedForDevelopmentItemIds.push(itemId);
-                if (!itemFamilySet.has(itemFamilyId) && itemId !== itemFamilyId) {
-                    const familyItem = item?.itemFamily;
-                    const familyItemMeetsCriteria = this.meetsCriteria({ item: familyItem });
-                    if (familyItemMeetsCriteria) {
+            }
+            if (!itemFamilySet.has(itemFamilyId) && itemId !== itemFamilyId) {
+                const familyItem = item?.itemFamily;
+                if (familyItem) {
+                    if (this.meetsCriteria({ item: familyItem })
+                        && !releasedForDevelopmentItemIds.includes(itemFamilyId)) {
                         releasedForDevelopmentItemIds.push(itemFamilyId);
                     }
-                    itemFamilySet.add(itemFamilyId);
+                    itemFamilySet.add(itemFamilyId); // only mark resolved when we had data to judge
                 }
             }
         }
@@ -512,18 +515,19 @@ class BaseProcessPublishAssortment {
             const itemFamilyId = item?.itemFamilyId;
             if (meetsCriteria) {
                 releasedForDevelopmentItemIds.push(itemId);
-                if (!itemFamilySet.has(itemFamilyId) && itemId !== itemFamilyId) {
-                    const familyItem = item?.itemFamily;
-                    if (familyItem) {
-                        const familyItemMeetsCriteria = this.meetsCriteria({ item: familyItem });
-                        if (familyItemMeetsCriteria) {
-                            releasedForDevelopmentItemIds.push(itemFamilyId);
-                        }
-                        itemFamilySet.add(itemFamilyId);
-                    }
-                    else {
-                        itemFamilySet.add(itemFamilyId);
+            }
+            if (!itemFamilySet.has(itemFamilyId) && itemId !== itemFamilyId) {
+                const familyItem = item?.itemFamily;
+                if (familyItem) {
+                    const familyItemMeetsCriteria = this.meetsCriteria({ item: familyItem });
+                    if (familyItemMeetsCriteria
+                        && !releasedForDevelopmentItemIds.includes(itemFamilyId)) {
+                        releasedForDevelopmentItemIds.push(itemFamilyId);
                     }
+                    itemFamilySet.add(itemFamilyId);
+                }
+                else {
+                    itemFamilySet.add(itemFamilyId);
                 }
             }
         }
@@ -730,7 +734,7 @@ class BaseProcessPublishAssortment {
         for (const [itemId, aItem] of assortmentItemFullChangeMap) {
             const projectItem = aItem?.projectItem;
             const itemFamilyId = aItem?.item?.itemFamilyId;
-            if (!pcd.releasedForDevelopmentItemIds.includes(itemFamilyId)) {
+            if (!pcd.releasedForDevelopmentItemIds.includes(itemFamilyId) || !pcd.releasedForDevelopmentItemIds.includes(itemId)) {
                 continue;
             }
             const ifc = itemFamilyChanges.get(itemFamilyId) || new item_family_changes_1.ItemFamilyChanges(itemFamilyId, pcd.sinceDate);
@@ -742,20 +746,6 @@ class BaseProcessPublishAssortment {
             if (pcd.itemToFederatedIdMapping.has(itemId)) {
                 ifc.itemToFederatedIdMapping.set(itemId, pcd.itemToFederatedIdMapping.get(itemId));
             }
-            // ---- NEW Step to enable ItemFamily publish ET-243: option is pre-development. It must not produce an
-            // LCSSKUSeasonLink, but a change to it still makes the family publishable. ----
-            if (!pcd.releasedForDevelopmentItemIds.includes(itemId)) {
-                const changedInWindow = addIds.includes(itemId)
-                    || deleteIds.includes(itemId)
-                    || updateIds.includes(itemId)
-                    || this.updatedSinceDate(projectItem, pcd.sinceDate)
-                    || this.updatedSinceDate(aItem?.item, pcd.sinceDate);
-                if (changedInWindow) {
-                    ifc.colorSuppressed.push(itemId);
-                }
-                continue;
-            }
-            // NEW Step - ends
             if (itemId === itemFamilyId) {
                 if (addIds.includes(itemId))
                     ifc.familyAdd = true;
@@ -771,12 +761,6 @@ class BaseProcessPublishAssortment {
                         ifc.familyUpdate = true;
                     }
                 }
-                // NEW Step to enable ItemFamily publish ET-243: item-level edits (incl. lifecycleStage) must publish
-                // the family. Guarded so the "first option added" flow stays suppressed. ----
-                if (!ifc.familyItemRemoved && this.updatedSinceDate(aItem?.item, pcd.sinceDate)) {
-                    ifc.familyUpdate = true;
-                }
-                // NEW Step - ends
                 if (projectItem && !projectItem?.roles && aItem?.item?.roles) {
                     projectItem.roles = aItem?.item?.roles;
                 }
@@ -875,10 +859,8 @@ class BaseProcessPublishAssortment {
         const LCSSeason = Object.assign({}, seasonFed);
         const assortment = await this.getAssortment(assortmentId);
         const projectItem = this.getProjectItem(itemFamilyChanges, itemFamilyChanges.itemFamilyId);
-        // ---- NEW Step to enable ItemFamily publish ET-243: added color suppressed length to existing condition, no other changes on familyAssortmentItem boolean
         const familyAssortmentItem = itemFamilyChanges.familyAdd || itemFamilyChanges.familyUpdate || itemFamilyChanges.familyDelete
             || itemFamilyChanges.colorAdds.length > 0 || itemFamilyChanges.colorUpdates.length > 0 || itemFamilyChanges.colorDeletes.length > 0
-            || itemFamilyChanges.colorSuppressed.length > 0
             || (projectItem && this.updatedSinceDate(projectItem, itemFamilyChanges.sinceDate));
         //familyItemRemoved is used when adding the first option to an assortment
         //and will have updates for the family item.

package/lib/publish/base-process-publish-assortment.spec.js

@@ -1337,150 +1337,6 @@ describe('getItemFamilyChanges', () => {
         expect(ifc.colorDeletes.length).toEqual(1);
     });
 });
-describe('getItemFamilyChanges - lifecycle-suppressed options', () => {
-    const familyId = 'AERfdvdAt1HHEVvQ';
-    const maroonId = 'YwWKVoL_vGN8khLy';
-    const limeId = 'rsmWhWiXRNv_XBJG';
-    const sinceDate = new Date('2026-08-01T00:00:00.000Z');
-    const afterSince = '2026-08-26T00:00:00.000Z';
-    const beforeSince = '2026-05-11T00:00:00.000Z';
-    const noDetailChanges = () => ({ adds: [], deletes: [], updates: [], familyItemsRemoved: [] });
-    const buildPpa = () => {
-        const config = {};
-        const mapFileUtil = new transform_data_1.MapFileUtil(new sdk_1.Entities());
-        const dc = new data_converter_1.DataConverter(config, mapFileUtil);
-        return new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
-    };
-    const buildPcd = (releasedIds) => {
-        const seasonFed = {
-            entityReference: 'assortment:11EZML5dMn3tREuT',
-            objectClass: 'LCSSeason'
-        };
-        const pcd = new publish_change_data_1.PublishChangeData('11EZML5dMn3tREuT', seasonFed, 'Pg3y2x5IclYxk3hM', sinceDate);
-        pcd.itemToFederatedIdMapping = new Map();
-        releasedIds.forEach(id => pcd.releasedForDevelopmentItemIds.push(id));
-        return pcd;
-    };
-    const familyItem = (updatedOn = beforeSince, lifecycleStage = 'released') => ({
-        id: familyId, itemFamilyId: familyId, lifecycleStage, name: 'Sweatpant', updatedOn
-    });
-    const familyRow = (updatedOn = beforeSince, lifecycleStage = 'released') => ({
-        itemId: familyId,
-        item: familyItem(updatedOn, lifecycleStage),
-        projectItem: { id: 'pi-' + familyId, updatedOn: beforeSince }
-    });
-    const optionRow = (id, updatedOn, lifecycleStage = 'concept') => ({
-        itemId: id,
-        item: { id, itemFamilyId: familyId, lifecycleStage, updatedOn, itemFamily: familyItem() },
-        projectItem: { id: 'pi-' + id, updatedOn: beforeSince },
-        familyProjectItem: { id: 'pi-' + familyId, updatedOn: beforeSince }
-    });
-    it('records changed concept options as suppressed, not as colour updates', () => {
-        const ppa = buildPpa();
-        const fullChangeMap = ppa.getFullChangeAssortmentMap({
-            assortmentItems: [familyRow(), optionRow(maroonId, afterSince), optionRow(limeId, afterSince)]
-        });
-        const pcd = buildPcd([familyId]);
-        pcd.itemFamilyChanges = ppa.getItemFamilyChanges(pcd, noDetailChanges(), fullChangeMap, new Map());
-        expect(pcd.itemFamilyChanges.size).toEqual(1);
-        const ifc = pcd.itemFamilyChanges.get(familyId);
-        expect(ifc.colorSuppressed).toEqual([maroonId, limeId]);
-        expect(ifc.colorAdds.length).toEqual(0);
-        expect(ifc.colorUpdates.length).toEqual(0);
-        expect(ifc.colorDeletes.length).toEqual(0);
-        expect(ifc.familyUpdate).toBe(false); // family itself unchanged
-    });
-    it('keeps the family reachable when only concept option rows are in the baseline', () => {
-        const ppa = buildPpa();
-        const fullChangeMap = ppa.getFullChangeAssortmentMap({
-            assortmentItems: [optionRow(maroonId, afterSince), optionRow(limeId, afterSince)]
-        });
-        const pcd = buildPcd([familyId]);
-        pcd.itemFamilyChanges = ppa.getItemFamilyChanges(pcd, noDetailChanges(), fullChangeMap, new Map());
-        expect(pcd.itemFamilyChanges.size).toEqual(1);
-        const ifc = pcd.itemFamilyChanges.get(familyId);
-        expect(ifc.itemFamilyObject.id).toEqual(familyId);
-        expect(ifc.colorSuppressed.length).toEqual(2);
-        // the suppressed option must stay in the map so the family's project item is reachable
-        expect(ppa.getProjectItem(ifc, familyId)).toEqual({ id: 'pi-' + familyId, updatedOn: beforeSince });
-    });
-    it('does not suppress-record an unchanged concept option', () => {
-        const ppa = buildPpa();
-        const fullChangeMap = ppa.getFullChangeAssortmentMap({
-            assortmentItems: [familyRow(), optionRow(maroonId, beforeSince)]
-        });
-        const pcd = buildPcd([familyId]);
-        pcd.itemFamilyChanges = ppa.getItemFamilyChanges(pcd, noDetailChanges(), fullChangeMap, new Map());
-        const ifc = pcd.itemFamilyChanges.get(familyId);
-        expect(ifc.colorSuppressed.length).toEqual(0);
-    });
-    it('picks up a concept option listed in the change detail even when timestamps are stale', () => {
-        const ppa = buildPpa();
-        const fullChangeMap = ppa.getFullChangeAssortmentMap({
-            assortmentItems: [familyRow(), optionRow(maroonId, beforeSince)]
-        });
-        const details = noDetailChanges();
-        details.updates = [{ id: maroonId }];
-        const pcd = buildPcd([familyId]);
-        pcd.itemFamilyChanges = ppa.getItemFamilyChanges(pcd, details, fullChangeMap, new Map());
-        expect(pcd.itemFamilyChanges.get(familyId).colorSuppressed).toEqual([maroonId]);
-    });
-    it('skips everything when the family itself is pre-development', () => {
-        const ppa = buildPpa();
-        const fullChangeMap = ppa.getFullChangeAssortmentMap({
-            assortmentItems: [familyRow(afterSince, 'concept'), optionRow(maroonId, afterSince)]
-        });
-        const pcd = buildPcd([]); // nothing released
-        pcd.itemFamilyChanges = ppa.getItemFamilyChanges(pcd, noDetailChanges(), fullChangeMap, new Map());
-        expect(pcd.itemFamilyChanges.size).toEqual(0);
-    });
-    it('still classifies released options normally', () => {
-        const ppa = buildPpa();
-        const fullChangeMap = ppa.getFullChangeAssortmentMap({
-            assortmentItems: [familyRow(), optionRow(maroonId, afterSince, 'released')]
-        });
-        const details = noDetailChanges();
-        details.adds = [{ id: maroonId }];
-        const pcd = buildPcd([familyId, maroonId]);
-        pcd.itemFamilyChanges = ppa.getItemFamilyChanges(pcd, details, fullChangeMap, new Map());
-        const ifc = pcd.itemFamilyChanges.get(familyId);
-        expect(ifc.colorAdds).toEqual([maroonId]);
-        expect(ifc.colorSuppressed.length).toEqual(0);
-    });
-    it('publishes a family-only row whose lifecycle just flipped (item-level edit)', () => {
-        const ppa = buildPpa();
-        const fullChangeMap = ppa.getFullChangeAssortmentMap({
-            assortmentItems: [familyRow(afterSince)] // item.updatedOn moved, projectItem did not
-        });
-        const pcd = buildPcd([familyId]);
-        pcd.itemFamilyChanges = ppa.getItemFamilyChanges(pcd, noDetailChanges(), fullChangeMap, new Map());
-        const ifc = pcd.itemFamilyChanges.get(familyId);
-        expect(ifc.familyUpdate).toBe(true); // fails without Step 3
-        expect(ifc.colorSuppressed.length).toEqual(0);
-    });
-    it('leaves an unchanged family-only row with no flags', () => {
-        const ppa = buildPpa();
-        const fullChangeMap = ppa.getFullChangeAssortmentMap({ assortmentItems: [familyRow()] });
-        const pcd = buildPcd([familyId]);
-        pcd.itemFamilyChanges = ppa.getItemFamilyChanges(pcd, noDetailChanges(), fullChangeMap, new Map());
-        const ifc = pcd.itemFamilyChanges.get(familyId);
-        expect(ifc.familyAdd).toBe(false);
-        expect(ifc.familyUpdate).toBe(false);
-        expect(ifc.familyDelete).toBe(false);
-        expect(ifc.colorSuppressed.length).toEqual(0);
-    });
-    it('does not set familyUpdate when the family item was removed', () => {
-        const ppa = buildPpa();
-        const fullChangeMap = ppa.getFullChangeAssortmentMap({ assortmentItems: [familyRow(afterSince)] });
-        const details = noDetailChanges();
-        details.familyItemsRemoved = [{ itemId: familyId }]; // note: itemId, not id
-        const pcd = buildPcd([familyId]);
-        pcd.itemFamilyChanges = ppa.getItemFamilyChanges(pcd, details, fullChangeMap, new Map());
-        const ifc = pcd.itemFamilyChanges.get(familyId);
-        expect(ifc.familyItemRemoved).toBe(true);
-        expect(ifc.familyUpdate).toBe(false); // fails if the !familyItemRemoved guard is dropped
-    });
-});
 describe('getProjectItem', () => {
     const config = {
         identifierAtts: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/flexplm",
-  "version": "1.7.4-alpha.879820c",
+  "version": "1.7.4-alpha.8ba0056",
   "description": "Library used for integration with flexplm.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",