@undp/carbon-library 1.0.285-CARBON-338.0 → 1.0.285-CARBON-406.0

package/dist/cjs/types/Definitions/Definitions/ndcDetails.definitions.d.ts

@@ -11,6 +11,7 @@ export type NdcDetail = {
     actionType: NdcDetailsActionType;
     nationalPlanObjective: string;
     kpi: number | string;
+    kpiUnit: string;
     ministryName: string;
     periodId?: number;
     status: NdcDetailsActionStatus;

package/dist/esm/index.js

@@ -26754,7 +26754,21 @@ var EditableCell = function (_a) {
                 }); },
             },
         ] },
-        React.createElement(Input, { onBlur: function () { return onBlurHandler(record); }, placeholder: t("ndc:nationalPlanObjectivePlaceHolder") }))) : editing && dataIndex === "kpi" ? (React.createElement(Form.Item, { name: dataIndex, style: { margin: 0 }, rules: [
+        React.createElement(Input, { onBlur: function () { return onBlurHandler(record); }, placeholder: t("ndc:nationalPlanObjectivePlaceHolder") }))) : editing && dataIndex === "kpiUnit" ? (React.createElement(Form.Item, { name: dataIndex, style: { margin: 0 }, rules: [
+            {
+                validator: function (rule, value) { return __awaiter(void 0, void 0, void 0, function () {
+                    var trimValue;
+                    return __generator(this, function (_a) {
+                        trimValue = typeof value === "string" ? value.trim() : value;
+                        if (!trimValue) {
+                            throw new Error("".concat(title, " ").concat(t("ndc:isRequired")));
+                        }
+                        return [2 /*return*/];
+                    });
+                }); },
+            },
+        ] },
+        React.createElement(Input, { onBlur: function () { return onBlurHandler(record); }, placeholder: t("ndc:kpiUnitPlaceHolder") }))) : editing && dataIndex === "kpi" ? (React.createElement(Form.Item, { name: dataIndex, style: { margin: 0 }, rules: [
             {
                 validator: function (rule, value) { return __awaiter(void 0, void 0, void 0, function () {
                     var trimValue;
@@ -26861,11 +26875,13 @@ var NdcDetailsComponent = function (props) {
             : undefined;
     var isGovernmentUser = (userInfoState === null || userInfoState === void 0 ? void 0 : userInfoState.companyRole) === CompanyRole.GOVERNMENT &&
         (userInfoState === null || userInfoState === void 0 ? void 0 : userInfoState.userRole) !== Role.ViewOnly;
-    var isMainNdcActionsEditable = !selectedPeriod.finalized &&
+    var isMainNdcActionsEditable = selectedPeriod &&
+        !selectedPeriod.finalized &&
         (userInfoState === null || userInfoState === void 0 ? void 0 : userInfoState.companyRole) === CompanyRole.GOVERNMENT &&
         (userInfoState === null || userInfoState === void 0 ? void 0 : userInfoState.userRole) !== Role.ViewOnly;
     var isSubNdcActionsEditable = function (record) {
-        return (!selectedPeriod.finalized &&
+        return (selectedPeriod &&
+            !selectedPeriod.finalized &&
             record.status !== NdcDetailsActionStatus.Approved &&
             ((userInfoState === null || userInfoState === void 0 ? void 0 : userInfoState.companyRole) === CompanyRole.GOVERNMENT ||
                 ((userInfoState === null || userInfoState === void 0 ? void 0 : userInfoState.companyRole) === CompanyRole.MINISTRY &&
@@ -26873,7 +26889,8 @@ var NdcDetailsComponent = function (props) {
             (userInfoState === null || userInfoState === void 0 ? void 0 : userInfoState.userRole) !== Role.ViewOnly);
     };
     var checkSubNdcActionCreatePermission = function () {
-        return (!selectedPeriod.finalized &&
+        return (selectedPeriod &&
+            !selectedPeriod.finalized &&
             ((userInfoState === null || userInfoState === void 0 ? void 0 : userInfoState.companyRole) === CompanyRole.GOVERNMENT ||
                 (userInfoState === null || userInfoState === void 0 ? void 0 : userInfoState.companyRole) === CompanyRole.MINISTRY) &&
             (userInfoState === null || userInfoState === void 0 ? void 0 : userInfoState.userRole) !== Role.ViewOnly);
@@ -26886,7 +26903,7 @@ var NdcDetailsComponent = function (props) {
             return isSubNdcActionsEditable(record);
         }
     };
-    var ndcMainDetailsForPeriod = selectedPeriod.key !== "add_new"
+    var ndcMainDetailsForPeriod = selectedPeriod && selectedPeriod.key !== "add_new"
         ? ndcActionsList.filter(function (ndcDetail) {
             return (ndcDetail.periodId === parseInt(selectedPeriod.key) &&
                 ndcDetail.actionType === NdcDetailsActionType.MainAction);
@@ -26902,6 +26919,7 @@ var NdcDetailsComponent = function (props) {
             actionType: NdcDetailsActionType.SubAction,
             nationalPlanObjective: "",
             kpi: "",
+            kpiUnit: "",
             ministryName: loginMinistry,
             status: NdcDetailsActionStatus.New,
             parentActionId: mainActionId,
@@ -26913,6 +26931,7 @@ var NdcDetailsComponent = function (props) {
             form.setFieldsValue({
                 nationalPlanObjective: "",
                 kpi: "",
+                kpiUnit: "",
             });
         }
         setSubNdcActionsForPeriod(subNdcDetails);
@@ -26954,6 +26973,7 @@ var NdcDetailsComponent = function (props) {
                         return [2 /*return*/];
                     }
                     else if (updatedFields.kpi === row.kpi &&
+                        updatedFields.kpiUnit === row.kpiUnit &&
                         updatedFields.nationalPlanObjective === row.nationalPlanObjective) {
                         ClearEditMode();
                         return [2 /*return*/];
@@ -26967,13 +26987,13 @@ var NdcDetailsComponent = function (props) {
                     else {
                         updatedItem.status = NdcDetailsActionStatus.Pending;
                     }
-                    return [4 /*yield*/, post("national/programme/addNdcDetailsAction", __assign(__assign({}, updatedItem), { kpi: parseInt(updatedItem.kpi.toString()) }))];
+                    return [4 /*yield*/, post("national/programme/addNdcDetailsAction", __assign(__assign({}, updatedItem), { kpi: parseFloat(updatedItem.kpi.toString()) }))];
                 case 5:
                     _a.sent();
                     return [3 /*break*/, 8];
                 case 6:
                     updatedItem.status = NdcDetailsActionStatus.Pending;
-                    return [4 /*yield*/, put("national/programme/updateNdcDetailsAction", __assign(__assign({}, updatedItem), { kpi: parseInt(updatedItem.kpi.toString()) }))];
+                    return [4 /*yield*/, put("national/programme/updateNdcDetailsAction", __assign(__assign({}, updatedItem), { kpi: parseFloat(updatedItem.kpi.toString()) }))];
                 case 7:
                     _a.sent();
                     _a.label = 8;
@@ -26998,6 +27018,7 @@ var NdcDetailsComponent = function (props) {
     var actionMenu = function (record) {
         if (record.status === NdcDetailsActionStatus.Pending &&
             isGovernmentUser &&
+            selectedPeriod &&
             !selectedPeriod.finalized) {
             return (React.createElement(List, { className: "action-menu", size: "small", dataSource: [
                     {
@@ -27057,7 +27078,17 @@ var NdcDetailsComponent = function (props) {
             width: 100,
             editable: true,
             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" })))); },
+                React.createElement("span", null, record.kpi))) : (React.createElement(Input, { placeholder: t("ndc:kpiPlaceHolder") })))); },
+        },
+        {
+            title: t("ndc:ndcColumnsKpiUnit"),
+            dataIndex: "kpiUnit",
+            key: "kpiUnit",
+            align: "left",
+            width: 100,
+            editable: true,
+            render: function (_, record) { return (React.createElement(Space, { size: "middle" }, record.kpiUnit ? (React.createElement(Tooltip, { title: isNdcActionEditable(record) ? "" : t("ndc:ndcUnauthorisedMsg") },
+                React.createElement("span", null, record.kpiUnit))) : (React.createElement(Input, { placeholder: t("ndc:kpiUnitPlaceHolder") })))); },
         },
         {
             title: t("ndc:ndcColumnsMinistry"),
@@ -27121,6 +27152,7 @@ var NdcDetailsComponent = function (props) {
                     form.setFieldsValue({
                         nationalPlanObjective: "",
                         kpi: "",
+                        kpiUnit: "",
                     });
                     periodId = parseInt(selectedPeriod.key);
                     newData_1 = {
@@ -27128,6 +27160,7 @@ var NdcDetailsComponent = function (props) {
                         actionType: NdcDetailsActionType.MainAction,
                         nationalPlanObjective: "",
                         kpi: "",
+                        kpiUnit: "",
                         ministryName: loginMinistry,
                         periodId: periodId,
                         status: NdcDetailsActionStatus.New,
@@ -27266,10 +27299,11 @@ var NdcDetailsComponent = function (props) {
                                 };
                             }, footer: function () {
                                 return isGovernmentUser &&
+                                    selectedPeriod &&
                                     !selectedPeriod.finalized && (React.createElement(Row, { justify: "center" },
                                     React.createElement(Button, { className: "btnAddNewMainAct", disabled: isMainActionInEditMode(), onClick: onClickedAddNewNdcDetail, type: "default" }, t("ndc:addNdcAction"))));
                             } })))),
-            isGovernmentUser && !selectedPeriod.finalized ? (React.createElement(Row, { justify: "end" }, isMainActionInEditMode() ? (React.createElement(React.Fragment, null,
+            isGovernmentUser && selectedPeriod && !selectedPeriod.finalized ? (React.createElement(Row, { justify: "end" }, isMainActionInEditMode() ? (React.createElement(React.Fragment, null,
                 React.createElement(Button, { className: "mg-left-1", disabled: true }, t("ndc:delete")),
                 React.createElement(Button, { className: "mg-left-1", disabled: true }, t("ndc:finalize")))) : (React.createElement(React.Fragment, null,
                 React.createElement(Button, { className: "mg-left-1 btn-danger", onClick: onClickedDeletePeriod, htmlType: "submit", loading: loading }, t("ndc:delete")),
@@ -27617,10 +27651,12 @@ var NdcDetailsComponent = function (props) {
                     React.createElement("div", { className: "body-title" }, t("ndc:ndcTitle")),
                     React.createElement("div", { className: "body-sub-title" }, t("ndc:ndcSubTitle"))))),
         React.createElement("div", null,
-            React.createElement(Tabs, { centered: false, defaultActiveKey: "1", items: periodItems, activeKey: selectedPeriod.key, onChange: onTabChange })),
-        React.createElement("div", null, selectedPeriod.key === "add_new"
-            ? addNewPeriodContent()
-            : mainNdcActionTableContent()),
+            React.createElement(Tabs, { centered: false, defaultActiveKey: "1", items: periodItems, activeKey: selectedPeriod ? selectedPeriod.key : "1", onChange: onTabChange })),
+        React.createElement("div", null, selectedPeriod
+            ? selectedPeriod.key === "add_new"
+                ? addNewPeriodContent()
+                : mainNdcActionTableContent()
+            : ""),
         React.createElement(UserActionConfirmationModel, { t: t, actionInfo: actionInfo, onActionConfirmed: onActionConfirmed, onActionCanceled: onActionCanceled, openModal: openConfirmationModal, errorMsg: "", loading: loading })));
 };
 
@@ -28194,8 +28230,8 @@ var ProgrammeTransferForm = function (props) {
                                 },
                                 {
                                     key: "companyRole",
-                                    operation: "=",
-                                    value: CompanyRole.PROGRAMME_DEVELOPER,
+                                    operation: "!=",
+                                    value: "Certifier",
                                 },
                             ],
                             sort: {