@rh-support/manage 2.1.98 → 2.1.100

package/lib/esm/components/ManageExpiredContents/ExpiredContentManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpiredContentManager.d.ts","sourceRoot":"","sources":["../../../../src/components/ManageExpiredContents/ExpiredContentManager.tsx"],"names":[],"mappings":"AAeA,OAAO,KAA2D,MAAM,OAAO,CAAC;AAUhF,MAAM,CAAC,OAAO,UAAU,qBAAqB,sBAoH5C"}
+{"version":3,"file":"ExpiredContentManager.d.ts","sourceRoot":"","sources":["../../../../src/components/ManageExpiredContents/ExpiredContentManager.tsx"],"names":[],"mappings":"AAeA,OAAO,KAA2D,MAAM,OAAO,CAAC;AAUhF,MAAM,CAAC,OAAO,UAAU,qBAAqB,sBAmH5C"}

package/lib/esm/components/ManageExpiredContents/ExpiredContentManager.js

@@ -13,8 +13,7 @@ import ExpiredContentHeader from './ExpiredContentHeader';
 export default function ExipredContentManager() {
     const expiredContentResultsRef = useRef(null);
     const { t } = useTranslation();
-    const [showApprochingExpiry, setShowApprochingExpiry] = useState(false);
-    const { expiredContentEditState, expiredContentResponse, filteredTags } = useContext(ExpiredContentStateContext);
+    const { expiredContentEditState, expiredContentResponse, filteredTags, showApprochingExpiry } = useContext(ExpiredContentStateContext);
     const { tags: availableTags } = useContext(TagManagementStateContext);
     const dispatch = useContext(ExpiredContentDispatchContext);
     const tagManagerDispatch = useContext(TagManagementDispatchContext);
@@ -37,7 +36,6 @@ export default function ExipredContentManager() {
         return filteredData;
     }, [contentFilteredByQuery, filteredTags]);
     const handleChange = (_event, checked) => {
-        setShowApprochingExpiry(checked);
         fetchExpiredContent(dispatch, checked);
     };
     const onTagFilterChange = (tags) => {

package/lib/esm/components/ManageExpiredContents/ExpiredContentSingleItem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpiredContentSingleItem.d.ts","sourceRoot":"","sources":["../../../../src/components/ManageExpiredContents/ExpiredContentSingleItem.tsx"],"names":[],"mappings":"AAIA,OAAO,KAA+B,MAAM,OAAO,CAAC;AAIpD,OAAO,EAEH,eAAe,EACf,wBAAwB,EAE3B,MAAM,sCAAsC,CAAC;AAG9C,UAAU,MAAM;IACZ,OAAO,EAAE,eAAe,CAAC;IACzB,QAAQ,EAAE,wBAAwB,CAAC;CACtC;AAED,MAAM,CAAC,OAAO,UAAU,wBAAwB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,MAAM,qBA2G7E"}
+{"version":3,"file":"ExpiredContentSingleItem.d.ts","sourceRoot":"","sources":["../../../../src/components/ManageExpiredContents/ExpiredContentSingleItem.tsx"],"names":[],"mappings":"AAIA,OAAO,KAA+B,MAAM,OAAO,CAAC;AAIpD,OAAO,EAEH,eAAe,EACf,wBAAwB,EAE3B,MAAM,sCAAsC,CAAC;AAG9C,UAAU,MAAM;IACZ,OAAO,EAAE,eAAe,CAAC;IACzB,QAAQ,EAAE,wBAAwB,CAAC;CACtC;AAED,MAAM,CAAC,OAAO,UAAU,wBAAwB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,MAAM,qBA4G7E"}

package/lib/esm/components/ManageExpiredContents/ExpiredContentSingleItem.js

@@ -19,7 +19,7 @@ import ExpiredContentSingleItemView from './ExpiredContentSingleItemView';
 export default function ExpiredContentSingleItem({ content, category }) {
     var _a, _b;
     const { t } = useTranslation();
-    const { expiredContentEditState, filteredTags } = useContext(ExpiredContentStateContext);
+    const { expiredContentEditState, filteredTags, showApprochingExpiry } = useContext(ExpiredContentStateContext);
     const dispatch = useContext(ExpiredContentDispatchContext);
     const [isPreview, setIsPreview] = useState(true);
     const [isSaving, setIsSaving] = useState(false);
@@ -30,7 +30,7 @@ export default function ExpiredContentSingleItem({ content, category }) {
     const onSave = (updatedContent, deletedTags) => __awaiter(this, void 0, void 0, function* () {
         try {
             setIsSaving(true);
-            yield updateExpiredContent(dispatch, expiredContentEditState, category.categoryId, updatedContent, deletedTags);
+            yield updateExpiredContent(dispatch, expiredContentEditState, category.categoryId, updatedContent, deletedTags, showApprochingExpiry);
             editToggle();
             ToastNotification.addSuccessMessage(t('Content updated successfully'));
         }

package/lib/esm/components/ManageExpiredContents/ExpiredContentSingleItemView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpiredContentSingleItemView.d.ts","sourceRoot":"","sources":["../../../../src/components/ManageExpiredContents/ExpiredContentSingleItemView.tsx"],"names":[],"mappings":"AAOA,OAAO,KAA2D,MAAM,OAAO,CAAC;AAIhF,OAAO,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAIjG,UAAU,MAAM;IACZ,OAAO,EAAE,eAAe,CAAC;IACzB,QAAQ,EAAE,wBAAwB,CAAC;IACnC,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,MAAM,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IAC1D,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,CAAC,OAAO,UAAU,4BAA4B,CAAC,EACjD,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,UAAU,GACb,EAAE,MAAM,qBAoQR"}
+{"version":3,"file":"ExpiredContentSingleItemView.d.ts","sourceRoot":"","sources":["../../../../src/components/ManageExpiredContents/ExpiredContentSingleItemView.tsx"],"names":[],"mappings":"AAOA,OAAO,KAA2D,MAAM,OAAO,CAAC;AAIhF,OAAO,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAIjG,UAAU,MAAM;IACZ,OAAO,EAAE,eAAe,CAAC;IACzB,QAAQ,EAAE,wBAAwB,CAAC;IACnC,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,MAAM,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IAC1D,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,CAAC,OAAO,UAAU,4BAA4B,CAAC,EACjD,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,UAAU,GACb,EAAE,MAAM,qBAqQR"}

package/lib/esm/components/ManageExpiredContents/ExpiredContentSingleItemView.js

@@ -90,7 +90,8 @@ export default function ExpiredContentSingleItemView({ category, content, onCanc
         setLocalExpiryDate(str);
     };
     const expiryDateValidator = (date) => {
-        if (date < new Date())
+        const today = new Date();
+        if (date < today)
             return t('Invalid expiry date');
         return '';
     };

package/lib/esm/components/TopContentManagement/TopContentEditor/TopContentCategoryContent/TopContentSingleItem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TopContentSingleItem.d.ts","sourceRoot":"","sources":["../../../../../../src/components/TopContentManagement/TopContentEditor/TopContentCategoryContent/TopContentSingleItem.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAiB,aAAa,EAAE,MAAM,0CAA0C,CAAC;AA8BtG,OAAO,KAA2D,MAAM,OAAO,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAM7D,OAAO,EAIH,oBAAoB,EAOvB,MAAM,wCAAwC,CAAC;AAIhD,UAAU,MAAM;IACZ,kBAAkB,EAAE,OAAO,CAAC;IAC5B,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAClC,CAAC,EAAE,MAAM,CAAC;CACb;AAED,wBAAgB,sBAAsB,CAAC,GAAG,KAAA,OASzC;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,6CA2B/C;AAED,eAAO,MAAM,oBAAoB,kDAAmD,MAAM,sBAmiBzF,CAAC"}
+{"version":3,"file":"TopContentSingleItem.d.ts","sourceRoot":"","sources":["../../../../../../src/components/TopContentManagement/TopContentEditor/TopContentCategoryContent/TopContentSingleItem.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAiB,aAAa,EAAE,MAAM,0CAA0C,CAAC;AA8BtG,OAAO,KAA2D,MAAM,OAAO,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAM7D,OAAO,EAIH,oBAAoB,EAOvB,MAAM,wCAAwC,CAAC;AAIhD,UAAU,MAAM;IACZ,kBAAkB,EAAE,OAAO,CAAC;IAC5B,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAClC,CAAC,EAAE,MAAM,CAAC;CACb;AAED,wBAAgB,sBAAsB,CAAC,GAAG,KAAA,OASzC;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,6CA2B/C;AAED,eAAO,MAAM,oBAAoB,kDAAmD,MAAM,sBAkiBzF,CAAC"}

package/lib/esm/components/TopContentManagement/TopContentEditor/TopContentCategoryContent/TopContentSingleItem.js

@@ -275,7 +275,6 @@ export const TopContentSingleItem = ({ isArrangingContent, category, snapshot, i
     };
     const expiryDateValidator = (date) => {
         const today = new Date();
-        today.setHours(0, 0, 0, 0);
         if (date < today)
             return t('Invalid expiry date');
         return '';

package/lib/esm/reducers/ExpiredContentReducer.d.ts

@@ -14,6 +14,7 @@ export interface IExpiredContentState {
     expiredContentResponse: IApiResponseDetails<IExpiredContentEditState[]>;
     expiredContentEditState: IExpiredContentEditState[];
     filteredTags: ITag[];
+    showApprochingExpiry: boolean;
 }
 export declare const initialExpiredContent: IExpiredContentState;
 export declare enum ExpiredContentReducerConstants {
@@ -28,7 +29,7 @@ export type ExpiredContentDispatchType = (value: IActionType) => void;
 export declare const ExpiredContentReducer: (state: IExpiredContentState, action: IActionType) => IExpiredContentState;
 export declare const isContentExpired: (expiryDate: string | undefined) => boolean;
 export declare const fetchExpiredContent: (dispatch: ExpiredContentDispatchType, fetchApproachingExpiry?: boolean) => Promise<void>;
-export declare const updateExpiredContent: (dispatch: ExpiredContentDispatchType, expiredContentEditState: IExpiredContentEditState[], categoryId: number, content: IExpiredContent, deletedTags?: any[]) => Promise<void>;
+export declare const updateExpiredContent: (dispatch: ExpiredContentDispatchType, expiredContentEditState: IExpiredContentEditState[], categoryId: number, content: IExpiredContent, deletedTags?: any[], showApprochingExpiry?: boolean) => Promise<void>;
 export declare const deleteExpiredContent: (dispatch: ExpiredContentDispatchType, expiredContentEditState: IExpiredContentEditState[], categoryId: number, topContentId: number) => Promise<never>;
 export declare const setExpiredContentFilteredTags: (dispatch: ExpiredContentDispatchType, tags: ITag[]) => void;
 export {};

package/lib/esm/reducers/ExpiredContentReducer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpiredContentReducer.d.ts","sourceRoot":"","sources":["../../../src/reducers/ExpiredContentReducer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,0CAA0C,CAAC;AAChE,OAAO,EACH,WAAW,EACX,eAAe,EAElB,MAAM,2DAA2D,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAMxE,MAAM,WAAW,eAAgB,SAAQ,WAAW;IAChD,OAAO,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,wBACb,SAAQ,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,WAAW,GAAG,cAAc,GAAG,cAAc,CAAC;IACxF,OAAO,EAAE,eAAe,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,oBAAoB;IACjC,sBAAsB,EAAE,mBAAmB,CAAC,wBAAwB,EAAE,CAAC,CAAC;IACxE,uBAAuB,EAAE,wBAAwB,EAAE,CAAC;IACpD,YAAY,EAAE,IAAI,EAAE,CAAC;CACxB;AAED,eAAO,MAAM,qBAAqB,EAAE,oBAInC,CAAC;AAEF,oBAAY,8BAA8B;IACtC,iBAAiB,sBAAsB;IACvC,oBAAoB,yBAAyB;IAC7C,mBAAmB,wBAAwB;IAC3C,yBAAyB,8BAA8B;IACvD,kBAAkB,uBAAuB;CAC5C;AAED,KAAK,WAAW,GAAG,OAAO,CAAC,8BAA8B,EAAE,oBAAoB,CAAC,CAAC;AACjF,MAAM,MAAM,0BAA0B,GAAG,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;AAEtE,eAAO,MAAM,qBAAqB,UAAW,oBAAoB,0BAAwB,oBAgCxF,CAAC;AAEF,eAAO,MAAM,gBAAgB,eAAgB,MAAM,GAAG,SAAS,YAM9D,CAAC;AASF,eAAO,MAAM,mBAAmB,aAClB,0BAA0B,2BACZ,OAAO,kBA2ElC,CAAC;AAEF,eAAO,MAAM,oBAAoB,aACnB,0BAA0B,2BACX,wBAAwB,EAAE,cACvC,MAAM,WACT,eAAe,gBACV,GAAG,EAAE,kBAmDtB,CAAC;AAEF,eAAO,MAAM,oBAAoB,aACnB,0BAA0B,2BACX,wBAAwB,EAAE,cACvC,MAAM,gBACJ,MAAM,mBAsBvB,CAAC;AAEF,eAAO,MAAM,6BAA6B,aAAc,0BAA0B,QAAQ,IAAI,EAAE,SAK/F,CAAC"}
+{"version":3,"file":"ExpiredContentReducer.d.ts","sourceRoot":"","sources":["../../../src/reducers/ExpiredContentReducer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,0CAA0C,CAAC;AAChE,OAAO,EACH,WAAW,EACX,eAAe,EAElB,MAAM,2DAA2D,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAMxE,MAAM,WAAW,eAAgB,SAAQ,WAAW;IAChD,OAAO,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,wBACb,SAAQ,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,WAAW,GAAG,cAAc,GAAG,cAAc,CAAC;IACxF,OAAO,EAAE,eAAe,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,oBAAoB;IACjC,sBAAsB,EAAE,mBAAmB,CAAC,wBAAwB,EAAE,CAAC,CAAC;IACxE,uBAAuB,EAAE,wBAAwB,EAAE,CAAC;IACpD,YAAY,EAAE,IAAI,EAAE,CAAC;IACrB,oBAAoB,EAAE,OAAO,CAAC;CACjC;AAED,eAAO,MAAM,qBAAqB,EAAE,oBAKnC,CAAC;AAEF,oBAAY,8BAA8B;IACtC,iBAAiB,sBAAsB;IACvC,oBAAoB,yBAAyB;IAC7C,mBAAmB,wBAAwB;IAC3C,yBAAyB,8BAA8B;IACvD,kBAAkB,uBAAuB;CAC5C;AAED,KAAK,WAAW,GAAG,OAAO,CAAC,8BAA8B,EAAE,oBAAoB,CAAC,CAAC;AACjF,MAAM,MAAM,0BAA0B,GAAG,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;AAEtE,eAAO,MAAM,qBAAqB,UAAW,oBAAoB,0BAAwB,oBAiCxF,CAAC;AAEF,eAAO,MAAM,gBAAgB,eAAgB,MAAM,GAAG,SAAS,YAM9D,CAAC;AASF,eAAO,MAAM,mBAAmB,aAClB,0BAA0B,2BACZ,OAAO,kBA8ElC,CAAC;AAEF,eAAO,MAAM,oBAAoB,aACnB,0BAA0B,2BACX,wBAAwB,EAAE,cACvC,MAAM,WACT,eAAe,gBACV,GAAG,EAAE,yBACG,OAAO,kBAmEhC,CAAC;AAEF,eAAO,MAAM,oBAAoB,aACnB,0BAA0B,2BACX,wBAAwB,EAAE,cACvC,MAAM,gBACJ,MAAM,mBAsBvB,CAAC;AAEF,eAAO,MAAM,6BAA6B,aAAc,0BAA0B,QAAQ,IAAI,EAAE,SAK/F,CAAC"}

package/lib/esm/reducers/ExpiredContentReducer.js

@@ -16,6 +16,7 @@ export const initialExpiredContent = {
     expiredContentResponse: getApiResourceObject([]),
     expiredContentEditState: [],
     filteredTags: [],
+    showApprochingExpiry: false,
 };
 export var ExpiredContentReducerConstants;
 (function (ExpiredContentReducerConstants) {
@@ -26,22 +27,22 @@ export var ExpiredContentReducerConstants;
     ExpiredContentReducerConstants["updateFilteredTags"] = "updateFilteredTags";
 })(ExpiredContentReducerConstants || (ExpiredContentReducerConstants = {}));
 export const ExpiredContentReducer = (state, action) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     switch (action.type) {
         case ExpiredContentReducerConstants.resetExpiredContent: {
             return initialExpiredContent;
         }
         case ExpiredContentReducerConstants.getExpiredContent: {
-            return Object.assign(Object.assign({}, state), { expiredContentEditState: [...(_a = action.payload) === null || _a === void 0 ? void 0 : _a.expiredContentEditState], expiredContentResponse: (_b = action.payload) === null || _b === void 0 ? void 0 : _b.expiredContentResponse });
+            return Object.assign(Object.assign({}, state), { expiredContentEditState: [...(_a = action.payload) === null || _a === void 0 ? void 0 : _a.expiredContentEditState], expiredContentResponse: (_b = action.payload) === null || _b === void 0 ? void 0 : _b.expiredContentResponse, showApprochingExpiry: (_c = action.payload) === null || _c === void 0 ? void 0 : _c.showApprochingExpiry });
         }
         case ExpiredContentReducerConstants.filterExpiredContent: {
-            return Object.assign(Object.assign({}, state), { expiredContentEditState: (_c = action.payload) === null || _c === void 0 ? void 0 : _c.expiredContentEditState });
+            return Object.assign(Object.assign({}, state), { expiredContentEditState: (_d = action.payload) === null || _d === void 0 ? void 0 : _d.expiredContentEditState });
         }
         case ExpiredContentReducerConstants.updateExpiredContentState: {
-            return Object.assign(Object.assign({}, state), { expiredContentEditState: (_d = action.payload) === null || _d === void 0 ? void 0 : _d.expiredContentEditState, expiredContentResponse: (_e = action.payload) === null || _e === void 0 ? void 0 : _e.expiredContentResponse });
+            return Object.assign(Object.assign({}, state), { expiredContentEditState: (_e = action.payload) === null || _e === void 0 ? void 0 : _e.expiredContentEditState, expiredContentResponse: (_f = action.payload) === null || _f === void 0 ? void 0 : _f.expiredContentResponse });
         }
         case ExpiredContentReducerConstants.updateFilteredTags: {
-            return Object.assign(Object.assign({}, state), { filteredTags: (_f = action.payload) === null || _f === void 0 ? void 0 : _f.filteredTags });
+            return Object.assign(Object.assign({}, state), { filteredTags: (_g = action.payload) === null || _g === void 0 ? void 0 : _g.filteredTags });
         }
         default: {
             return state;
@@ -73,6 +74,7 @@ export const fetchExpiredContent = (dispatch, fetchApproachingExpiry = false) =>
             payload: {
                 expiredContentResponse: getApiResourceObject([], true),
                 expiredContentEditState: [],
+                showApprochingExpiry: fetchApproachingExpiry,
             },
         });
         const [products, expiredContents] = yield Promise.all([
@@ -109,6 +111,7 @@ export const fetchExpiredContent = (dispatch, fetchApproachingExpiry = false) =>
             payload: {
                 expiredContentResponse: getApiResourceObject(cloneDeep(resultGroupedByCategory)),
                 expiredContentEditState: resultGroupedByCategory,
+                showApprochingExpiry: fetchApproachingExpiry,
             },
         });
     }
@@ -118,11 +121,12 @@ export const fetchExpiredContent = (dispatch, fetchApproachingExpiry = false) =>
             payload: {
                 expiredContentResponse: getApiResourceObject([], false, true, err.message),
                 expiredContentEditState: [],
+                showApprochingExpiry: fetchApproachingExpiry,
             },
         });
     }
 });
-export const updateExpiredContent = (dispatch, expiredContentEditState, categoryId, content, deletedTags) => __awaiter(void 0, void 0, void 0, function* () {
+export const updateExpiredContent = (dispatch, expiredContentEditState, categoryId, content, deletedTags, showApprochingExpiry = false) => __awaiter(void 0, void 0, void 0, function* () {
     const toUpdate = {
         id: content.topContentId,
         contentTitle: content.contentTitle,
@@ -132,6 +136,11 @@ export const updateExpiredContent = (dispatch, expiredContentEditState, category
         expiryDate: content.expiryDate,
         isActive: 1,
     };
+    let expiryTimeLimit = new Date();
+    if (showApprochingExpiry) {
+        // Add 7 days to the current date
+        expiryTimeLimit.setDate(expiryTimeLimit.getDate() + 7);
+    }
     try {
         if (deletedTags && !isEmpty(deletedTags)) {
             yield Promise.all(deletedTags.map((t) => pcm.topContentTag.deleteTagFromTopContent(content.topContentId, t)));
@@ -146,11 +155,19 @@ export const updateExpiredContent = (dispatch, expiredContentEditState, category
             }
         });
         // We need to clone deep current state to re-render
-        const clonedExpiredContentEditState = cloneDeep(expiredContentEditState);
+        const clonedExpiredContentEditState = cloneDeep(expiredContentEditState)
+            .map((cat) => {
+            const expiredContents = cat.content.filter((c) => {
+                const contentExpiryDate = new Date(c.expiryDate);
+                return contentExpiryDate <= expiryTimeLimit;
+            });
+            return Object.assign(Object.assign({}, cat), { content: expiredContents });
+        })
+            .filter((c) => c.content.length > 0);
         dispatch({
             type: ExpiredContentReducerConstants.updateExpiredContentState,
             payload: {
-                expiredContentResponse: getApiResourceObject(cloneDeep(clonedExpiredContentEditState)),
+                expiredContentResponse: getApiResourceObject(clonedExpiredContentEditState),
                 expiredContentEditState: clonedExpiredContentEditState,
             },
         });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/manage",
-    "version": "2.1.98",
+    "version": "2.1.100",
     "description": "Customer Support Manage App",
     "author": "Jordan Eudy <jeudy100@gmail.com>",
     "license": "ISC",
@@ -79,9 +79,9 @@
         "@patternfly/patternfly": "5.1.0",
         "@patternfly/react-core": "5.1.1",
         "@patternfly/react-table": "5.1.1",
-        "@rh-support/components": "2.1.75",
+        "@rh-support/components": "2.1.76",
         "@rh-support/configs": "2.0.20",
-        "@rh-support/react-context": "2.1.84",
+        "@rh-support/react-context": "2.1.85",
         "@rh-support/types": "2.0.4",
         "@rh-support/user-permissions": "2.1.49",
         "@rh-support/utils": "2.1.38",
@@ -102,5 +102,5 @@
         "defaults and supports es6-module",
         "maintained node versions"
     ],
-    "gitHead": "12904e607b35269b1d12cb8bd501200d8308bdaa"
+    "gitHead": "c823817e7dd1f3e6bb677467063592028f7438d7"
 }