@undp/carbon-library 1.0.274-CARBON-363.33 → 1.0.274-CARBON-363.42

package/dist/esm/index.js

@@ -26944,7 +26944,8 @@ var NdcDetailsComponent = function (props) {
             align: "left",
             width: 400,
             editable: true,
-            render: function (_, record) { return (React.createElement(Space, { size: "middle" }, record.nationalPlanObjective ? (React.createElement("span", null, record.nationalPlanObjective)) : (React.createElement(Input, { placeholder: "Enter National Plan Objective" })))); },
+            render: function (_, record) { return (React.createElement(Space, { size: "middle" }, record.nationalPlanObjective ? (React.createElement(Tooltip, { title: isNdcActionEditable(record) ? "" : t("ndc:ndcUnauthorisedMsg") },
+                React.createElement("span", null, record.nationalPlanObjective))) : (React.createElement(Input, { placeholder: "Enter National Plan Objective" })))); },
         },
         {
             title: t("ndc:ndcColumnsKpi"),
@@ -26953,7 +26954,8 @@ var NdcDetailsComponent = function (props) {
             align: "left",
             width: 100,
             editable: true,
-            render: function (_, record) { return (React.createElement(Space, { size: "middle" }, record.kpi ? (React.createElement("span", null, record.kpi)) : (React.createElement(Input, { placeholder: "Enter Kpi" })))); },
+            render: function (_, record) { return (React.createElement(Space, { size: "middle" }, record.kpi ? (React.createElement(Tooltip, { title: isNdcActionEditable(record) ? "" : t("ndc:ndcUnauthorisedMsg") },
+                React.createElement("span", null, record.kpi))) : (React.createElement(Input, { placeholder: "Enter Kpi" })))); },
         },
         {
             title: t("ndc:ndcColumnsMinistry"),
@@ -26962,7 +26964,7 @@ var NdcDetailsComponent = function (props) {
             align: "left",
             width: 300,
             editable: false,
-            render: function (_, record) { return (React.createElement(React.Fragment, null,
+            render: function (_, record) { return (React.createElement(Tooltip, { title: isSubNdcActionsEditable(record) ? "" : t("ndc:ndcUnauthorisedMsg") },
                 React.createElement(Select, { disabled: !(isSubNdcActionsEditable(record) && isEditing(record)), defaultValue: record.ministryName ? record.ministryName : loginMinistry, style: { width: 220 }, onChange: function (value, option) {
                         record.ministryName = option.label;
                         handleSave(record);
@@ -27062,7 +27064,7 @@ var NdcDetailsComponent = function (props) {
         });
     }); };
     var onClickedFinalizePeriod = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var pendingActions;
+        var isPendingActionAvailable;
         return __generator(this, function (_a) {
             if (ndcMainDetailsForPeriod.length === 0) {
                 message.open({
@@ -27073,10 +27075,19 @@ var NdcDetailsComponent = function (props) {
                 });
                 return [2 /*return*/];
             }
-            pendingActions = subNdcActionsForPeriod.filter(function (action) {
-                return action.status === NdcDetailsActionStatus.Pending;
+            isPendingActionAvailable = false;
+            ndcMainDetailsForPeriod.forEach(function (mainAction) {
+                var pendingActions = ndcActionsList.filter(function (action) {
+                    return (action.status === NdcDetailsActionStatus.Pending &&
+                        action.actionType === NdcDetailsActionType.SubAction &&
+                        action.parentActionId === mainAction.id);
+                });
+                if (pendingActions && pendingActions.length > 0) {
+                    isPendingActionAvailable = true;
+                    return;
+                }
             });
-            if (pendingActions && pendingActions.length > 0) {
+            if (isPendingActionAvailable) {
                 message.open({
                     type: "error",
                     content: t("ndc:finalizeErrorText"),
@@ -27157,8 +27168,8 @@ var NdcDetailsComponent = function (props) {
                                     React.createElement(Button, { className: "btnAddNewMainAct", disabled: isMainActionInEditMode(), onClick: onClickedAddNewNdcDetail, type: "default" }, t("ndc:addNdcAction"))));
                             } })))),
             isGovernmentUser && !selectedPeriod.finalized ? (React.createElement(Row, { justify: "end" },
-                React.createElement(Button, { className: "mg-left-1 btn-danger", onClick: onClickedDeletePeriod, htmlType: "submit", loading: loading }, t("ndc:delete")),
-                React.createElement(Button, { className: "mg-left-1", type: "primary", onClick: onClickedFinalizePeriod, htmlType: "submit", loading: loading }, t("ndc:finalize")))) : ("")));
+                React.createElement(Button, { className: "mg-left-1 btn-danger", onClick: onClickedDeletePeriod, htmlType: "submit", disabled: isMainActionInEditMode(), loading: loading }, t("ndc:delete")),
+                React.createElement(Button, { className: "mg-left-1", type: "primary", onClick: onClickedFinalizePeriod, disabled: isMainActionInEditMode(), htmlType: "submit", loading: loading }, t("ndc:finalize")))) : ("")));
     }
     function subNdcActionTableContent(record) {
         return (React.createElement(Table, { tableLayout: "fixed", rowKey: "id", components: components, rowClassName: function () { return "editable-row"; }, className: "common-table-class", bordered: true, dataSource: subNdcActionsForPeriod, loading: loading, onRow: function (record, rowIndex) {
@@ -27325,6 +27336,8 @@ var NdcDetailsComponent = function (props) {
                                 style: { textAlign: "right", marginRight: 15, marginTop: 10 },
                             });
                             fetchNdcDetailPeriods();
+                            setExpandedRowKeys([]);
+                            setEditingKey(null);
                         }
                         else if (actionInfo.action === "Approve") {
                             message.open({