@topconsultnpm/sdkui-react 6.20.0-dev2.42 → 6.20.0-dev2.44

package/lib/components/features/documents/TMDcmtForm.js

@@ -647,7 +647,7 @@ const TMDcmtForm = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallback, addTa
         if (layoutMode !== LayoutModes.Update || !moreInfoTasks) {
             return false;
         }
-        return moreInfoTasks.some(task => isTaskMoreInfo(task.name) && task.state !== Task_States.Completed);
+        return moreInfoTasks.some(task => isTaskMoreInfo(task.name) && task.state !== Task_States.Completed && task.state !== Task_States.Closed);
     }, [layoutMode, moreInfoTasks]);
     const showToppyForReferences = useMemo(() => {
         if (!allowButtonsRefs || layoutMode !== LayoutModes.Update || isOpenDetails || isOpenMaster)
@@ -1209,7 +1209,7 @@ const TMDcmtForm = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallback, addTa
         }
     }, [shouldShowAll, showAll]);
     const afterTaskSaved = useCallback(async (task, formMode, forceRefresh = false) => {
-        const shouldRefresh = forceRefresh || (task && task.state === Task_States.Completed) || formMode === FormModes.Create || formMode === FormModes.Duplicate;
+        const shouldRefresh = forceRefresh || (task && (task.state === Task_States.Completed || task.state === Task_States.Closed)) || formMode === FormModes.Create || formMode === FormModes.Duplicate;
         if (TID && DID && shouldRefresh) {
             await triggerBlogRefresh();
         }
@@ -1373,8 +1373,8 @@ const TMDcmtForm = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallback, addTa
             };
         }
         try {
-            const assignedToMe = getTaskAssignedToMe(allTasks).filter(task => task.iD1?.toString() === TID.toString() && task.iD2?.toString() === DID.toString() && task.state !== Task_States.Completed).length ?? 0;
-            const assignedByMe = getTaskAssignedByMe(allTasks).filter(task => task.iD1?.toString() === TID.toString() && task.iD2?.toString() === DID.toString() && task.state !== Task_States.Completed).length ?? 0;
+            const assignedToMe = getTaskAssignedToMe(allTasks).filter(task => task.iD1?.toString() === TID.toString() && task.iD2?.toString() === DID.toString() && task.state !== Task_States.Completed && task.state !== Task_States.Closed).length ?? 0;
+            const assignedByMe = getTaskAssignedByMe(allTasks).filter(task => task.iD1?.toString() === TID.toString() && task.iD2?.toString() === DID.toString() && task.state !== Task_States.Completed && task.state !== Task_States.Closed).length ?? 0;
             return {
                 assignedToMe,
                 assignedByMe

package/lib/components/features/tasks/TMTasksUtils.d.ts

@@ -124,6 +124,7 @@ export declare enum FilterCategoryId {
     New = 1.2,
     InProgress = 1.3,
     Completed = 1.4,
+    Closed = 1.45,
     Pending = 1.5,
     Postponed = 1.6,
     Low = 2.1,

package/lib/components/features/tasks/TMTasksUtils.js

@@ -134,6 +134,8 @@ export const getStatusLocalizatorValues = () => {
         switch (status) {
             case Task_States.Completed:
                 return ({ value: status, display: SDKUI_Localizator.Completed });
+            case Task_States.Closed:
+                return ({ value: status, display: SDKUI_Localizator.Closed });
             case Task_States.Deferred:
                 return ({ value: status, display: SDKUI_Localizator.Postponed });
             case Task_States.InProgress:
@@ -151,6 +153,8 @@ export const getStatusLocalizatorValue = (status) => {
     switch (status) {
         case Task_States.Completed:
             return SDKUI_Localizator.Completed;
+        case Task_States.Closed:
+            return SDKUI_Localizator.Closed;
         case Task_States.Deferred:
             return SDKUI_Localizator.Postponed;
         case Task_States.InProgress:
@@ -179,7 +183,8 @@ export const getTaskNotPersonalAssignedToMe = (tasks) => {
         .filter((task) => task.fromID !== undefined &&
         task.fromID !== userID &&
         task.toID === userID &&
-        task.state !== Task_States.Completed)
+        task.state !== Task_States.Completed &&
+        task.state !== Task_States.Closed)
         .sort((a, b) => {
         if (!a.endTime && !b.endTime)
             return 0;
@@ -196,7 +201,8 @@ export const getTaskPersonalAssignedToMe = (tasks) => {
         .filter((task) => task.fromID !== undefined &&
         task.fromID === userID &&
         task.toID === userID &&
-        task.state !== Task_States.Completed)
+        task.state !== Task_States.Completed &&
+        task.state !== Task_States.Closed)
         .sort((a, b) => {
         if (!a.endTime && !b.endTime)
             return 0;
@@ -216,7 +222,8 @@ export const getTaskNotCompletedAssignedByMe = (tasks) => {
     return tasks
         .filter((task) => task.toID !== undefined &&
         task.toID !== userID &&
-        task.state !== Task_States.Completed).sort((a, b) => {
+        task.state !== Task_States.Completed &&
+        task.state !== Task_States.Closed).sort((a, b) => {
         if (!a.endTime && !b.endTime)
             return 0;
         if (!a.endTime)
@@ -484,6 +491,7 @@ export const createTasksMenuItems = (taskDescriptor, showId, setShowId, showSear
                 { icon: _jsx("span", { className: "dx-icon-product" }), name: SDKUI_Localizator.NewFemale, operationType: 'multiRow', onClick: (rowIds) => markAsStatus(getRowIdsAsArray(rowIds), Task_States.NotStarted) },
                 { icon: _jsx("span", { className: "dx-icon-refresh" }), name: SDKUI_Localizator.InProgress, operationType: 'multiRow', onClick: (rowIds) => markAsStatus(getRowIdsAsArray(rowIds), Task_States.InProgress) },
                 { icon: _jsx("span", { className: "dx-icon-check" }), name: SDKUI_Localizator.Completed, operationType: 'multiRow', onClick: (rowIds) => markAsStatus(getRowIdsAsArray(rowIds), Task_States.Completed) },
+                { icon: _jsx("span", { className: "dx-icon-imgarlock" }), name: SDKUI_Localizator.Closed, operationType: 'multiRow', onClick: (rowIds) => markAsStatus(getRowIdsAsArray(rowIds), Task_States.Closed) },
                 { icon: _jsx("span", { className: "dx-icon-taskstop" }), name: SDKUI_Localizator.Pending, operationType: 'multiRow', onClick: (rowIds) => markAsStatus(getRowIdsAsArray(rowIds), Task_States.Waiting) },
                 { icon: _jsx("span", { className: "dx-icon-clock" }), name: SDKUI_Localizator.Postponed, operationType: 'multiRow', onClick: (rowIds) => markAsStatus(getRowIdsAsArray(rowIds), Task_States.Deferred) }
             ]
@@ -636,6 +644,7 @@ export var FilterCategoryId;
     FilterCategoryId[FilterCategoryId["New"] = 1.2] = "New";
     FilterCategoryId[FilterCategoryId["InProgress"] = 1.3] = "InProgress";
     FilterCategoryId[FilterCategoryId["Completed"] = 1.4] = "Completed";
+    FilterCategoryId[FilterCategoryId["Closed"] = 1.45] = "Closed";
     FilterCategoryId[FilterCategoryId["Pending"] = 1.5] = "Pending";
     FilterCategoryId[FilterCategoryId["Postponed"] = 1.6] = "Postponed";
     FilterCategoryId[FilterCategoryId["Low"] = 2.1] = "Low";
@@ -651,6 +660,7 @@ export const filterTreeTask = (tasks, filtersApplied) => {
         [FilterCategoryId.New]: (task) => task.state === undefined || task.state === Task_States.NotStarted,
         [FilterCategoryId.InProgress]: (task) => task.state === Task_States.InProgress,
         [FilterCategoryId.Completed]: (task) => task.state === Task_States.Completed,
+        [FilterCategoryId.Closed]: (task) => task.state === Task_States.Closed,
         [FilterCategoryId.Pending]: (task) => task.state === Task_States.Waiting,
         [FilterCategoryId.Postponed]: (task) => task.state === Task_States.Deferred,
         // Low = Low + Normal: Merged 'Low' and 'Normal' filters for backwards compatibility

package/lib/components/features/tasks/TMTasksUtilsView.js

@@ -11,6 +11,7 @@ const taskStateIconClassMap = () => {
         [Task_States.NotStarted, "dx-icon-product"],
         [Task_States.InProgress, "dx-icon-refresh"],
         [Task_States.Completed, "dx-icon-check"],
+        [Task_States.Closed, "dx-icon-imgarlock"],
         [Task_States.Waiting, "dx-icon-taskstop"],
         [Task_States.Deferred, "dx-icon-clock"],
     ]);
@@ -21,6 +22,7 @@ export const taskStateIconMap = (fontSize = 20) => {
         [Task_States.NotStarted, _jsx("i", { style: { fontSize }, className: taskStateIconClassMap().get(Task_States.NotStarted) }, "Task_States-NotStarted")],
         [Task_States.InProgress, _jsx("i", { style: { fontSize }, className: taskStateIconClassMap().get(Task_States.InProgress) }, "Task_States-InProgress")],
         [Task_States.Completed, _jsx("i", { style: { fontSize }, className: taskStateIconClassMap().get(Task_States.Completed) }, "Task_States-Completed")],
+        [Task_States.Closed, _jsx("i", { style: { fontSize }, className: taskStateIconClassMap().get(Task_States.Closed) }, "Task_States-Closed")],
         [Task_States.Waiting, _jsx("i", { style: { fontSize }, className: taskStateIconClassMap().get(Task_States.Waiting) }, "Task_States-Waiting")],
         [Task_States.Deferred, _jsx("i", { style: { fontSize }, className: taskStateIconClassMap().get(Task_States.Deferred) }, "Task_States-Deferred")]
     ]);
@@ -35,8 +37,8 @@ export const calculateNumberOfDays = (startTime, endTime) => {
 };
 export const renderTaskIcons = (taskData) => {
     const { stateLabel, stateTooltipLabel, pdg, ID1Name, endTime, remTime, isNew, numberOfDays } = taskData;
-    return (_jsxs("div", { style: { display: "flex", alignItems: "center", gap: "4px" }, children: [_jsx(TMTooltip, { content: stateTooltipLabel, children: _jsx("div", { className: "task-icon", children: taskStateIconMap().get(stateLabel) }) }), (stateLabel !== Task_States.Completed && endTime && taskIsExpiringSoon(endTime, remTime)) &&
-                _jsx(TMTooltip, { content: SDKUI_Localizator.Expiring, children: _jsx("i", { className: "dx-icon-warning task-icon" }) }), _jsx(TMTooltip, { content: gotoPDGExtendedLabel(false, pdg ?? PdGs.None, ID1Name), children: _jsx("div", { className: "task-icon", style: {
+    return (_jsxs("div", { style: { display: "flex", alignItems: "center", gap: "4px" }, children: [_jsx(TMTooltip, { content: stateTooltipLabel, children: _jsx("div", { className: "task-icon", children: taskStateIconMap().get(stateLabel) }) }), (stateLabel !== Task_States.Completed && stateLabel !== Task_States.Closed && endTime && taskIsExpiringSoon(endTime, remTime)) &&
+                _jsx(TMTooltip, { content: SDKUI_Localizator.Expiring, children: _jsx("i", { className: "dx-icon-warning task-icon", style: { fontSize: 20 } }) }), _jsx(TMTooltip, { content: gotoPDGExtendedLabel(false, pdg ?? PdGs.None, ID1Name), children: _jsx("div", { className: "task-icon", style: {
                         marginLeft: pdg === PdGs.CF || pdg === PdGs.WG ? "-4px" : undefined,
                         marginRight: pdg === PdGs.CF || pdg === PdGs.WG ? "-4px" : undefined,
                     }, children: getPdgsIconMap().get(pdg) }) }), numberOfDays > 1 &&
@@ -106,6 +108,7 @@ export const treeFilterDataSource = (allTasks) => {
     const newNotStartedLength = filterTreeTask(allTasks, [FilterCategoryId.New]).length ?? 0;
     const inProgressLength = filterTreeTask(allTasks, [FilterCategoryId.InProgress]).length ?? 0;
     const completedLength = filterTreeTask(allTasks, [FilterCategoryId.Completed]).length ?? 0;
+    const closedLength = filterTreeTask(allTasks, [FilterCategoryId.Closed]).length ?? 0;
     const pendingLength = filterTreeTask(allTasks, [FilterCategoryId.Pending]).length ?? 0;
     const postponedLength = filterTreeTask(allTasks, [FilterCategoryId.Postponed]).length ?? 0;
     const lowLength = filterTreeTask(allTasks, [FilterCategoryId.Low]).length ?? 0;
@@ -120,6 +123,7 @@ export const treeFilterDataSource = (allTasks) => {
         { id: FilterCategoryId.New, label: SDKUI_Localizator.NewFemale + " (" + newNotStartedLength + ")", value: Task_States.NotStarted, categoryId: FilterCategoryId.AllStates },
         { id: FilterCategoryId.InProgress, label: SDKUI_Localizator.InProgress + " (" + inProgressLength + ")", value: Task_States.InProgress, categoryId: FilterCategoryId.AllStates },
         { id: FilterCategoryId.Completed, label: SDKUI_Localizator.Completed + " (" + completedLength + ")", value: Task_States.Completed, categoryId: FilterCategoryId.AllStates },
+        { id: FilterCategoryId.Closed, label: SDKUI_Localizator.Closed + " (" + closedLength + ")", value: Task_States.Closed, categoryId: FilterCategoryId.AllStates },
         { id: FilterCategoryId.Pending, label: SDKUI_Localizator.Pending + " (" + pendingLength + ")", value: Task_States.Waiting, categoryId: FilterCategoryId.AllStates },
         { id: FilterCategoryId.Postponed, label: SDKUI_Localizator.Postponed + " (" + postponedLength + ")", value: Task_States.Deferred, categoryId: FilterCategoryId.AllStates },
         // Low = Low + Normal for backwards compatibility with version 5

package/lib/helper/SDKUI_Localizator.d.ts

@@ -99,6 +99,7 @@ export declare class SDKUI_Localizator {
     static get ClearCache(): string;
     static get ClearOTP(): "OTP löschen" | "Clear OTP" | "Borrar OTP" | "Effacer l'OTP" | "Limpar OTP" | "Cancella OTP";
     static get Close(): "Ausgang" | "Close" | "Salida" | "Sortie" | "Saída" | "Chiudi";
+    static get Closed(): "Geschlossen" | "Closed" | "Cerrada" | "Fermée" | "Fechada" | "Chiusa";
     static get Columns_All_Hide(): "Alle Spalten ausblenden" | "Hide all columns" | "Ocultar todas las columnas" | "Masquer toutes les colonnes" | "Ocultar todas as colunas" | "Nascondi tutte le colonne";
     static get Columns_All_Show(): "Alle Spalten anzeigen" | "Show all columns" | "Mostrar todas las columnas" | "Afficher toutes les colonnes" | "Mostrar todas as colunas" | "Visualizza tutte le colonne";
     static get Comment(): string;

package/lib/helper/SDKUI_Localizator.js

@@ -970,6 +970,16 @@ export class SDKUI_Localizator {
             default: return "Chiudi";
         }
     }
+    static get Closed() {
+        switch (this._cultureID) {
+            case CultureIDs.De_DE: return "Geschlossen";
+            case CultureIDs.En_US: return "Closed";
+            case CultureIDs.Es_ES: return "Cerrada";
+            case CultureIDs.Fr_FR: return "Fermée";
+            case CultureIDs.Pt_PT: return "Fechada";
+            default: return "Chiusa";
+        }
+    }
     static get Columns_All_Hide() {
         switch (this._cultureID) {
             case CultureIDs.De_DE: return "Alle Spalten ausblenden";

package/lib/helper/helpers.js

@@ -540,6 +540,7 @@ export const getMoreInfoTasksForDocument = (allTasks, TID, DID) => {
         return [];
     return allTasks.filter(task => isTaskMoreInfo(task.name) &&
         task.state !== Task_States.Completed &&
+        task.state !== Task_States.Closed &&
         task.iD1?.toString() === TID.toString() &&
         task.iD2?.toString() === DID.toString());
 };

package/lib/helper/index.d.ts

@@ -14,3 +14,4 @@ export * from './TMToppyMessage';
 export * from './GlobalStyles';
 export * from './checkinCheckoutManager';
 export * from './workItemsHelper';
+export * from './devextremeCustomMessages';

package/lib/helper/index.js

@@ -14,3 +14,4 @@ export * from './TMToppyMessage';
 export * from './GlobalStyles';
 export * from './checkinCheckoutManager';
 export * from './workItemsHelper';
+export * from './devextremeCustomMessages';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@topconsultnpm/sdkui-react",
-    "version": "6.20.0-dev2.42",
+    "version": "6.20.0-dev2.44",
     "description": "",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",