@undp/carbon-library 1.0.292-CARBON-369.2 → 1.0.292-CARBON-423.1

package/dist/cjs/index.js

@@ -27628,7 +27628,7 @@ var EditableCell = function (_a) {
         React.createElement(antd.Input, { onBlur: function () { return onBlurHandler(record); }, placeholder: t("ndc:kpiPlaceHolder") }))) : (children)));
 };
 
-var css_248z$7 = ".ndc-steps-actions {\n  display: flex;\n  flex-direction: row-reverse;\n  margin-right: 1rem;\n  justify-content: center; }\n  .ndc-steps-actions .action-btn {\n    border: 1px solid #16b1ff;\n    color: #16b1ff;\n    margin-right: 1rem; }\n  .ndc-steps-actions .back-btn {\n    border: 1px solid rgba(140, 140, 140, 0.7);\n    color: rgba(140, 140, 140, 0.7);\n    margin-right: 1rem; }\n  .ndc-steps-actions .mg-left-1 {\n    margin-left: 1rem; }\n\n.ndc-details .ant-input-number-input-wrap {\n  margin-right: 10px; }\n\n.ndc-details tbody {\n  vertical-align: top; }\n\n.ndc-details td .ant-space-item {\n  margin-top: 5px; }\n\n.ndc-details .btn-danger {\n  color: #ff4d4f !important;\n  border-color: #ff8183 !important; }\n";
+var css_248z$7 = ".ndc-steps-actions {\n  display: flex;\n  flex-direction: row-reverse;\n  margin-right: 1rem;\n  justify-content: center; }\n  .ndc-steps-actions .action-btn {\n    border: 1px solid #16b1ff;\n    color: #16b1ff;\n    margin-right: 1rem; }\n  .ndc-steps-actions .back-btn {\n    border: 1px solid rgba(140, 140, 140, 0.7);\n    color: rgba(140, 140, 140, 0.7);\n    margin-right: 1rem; }\n  .ndc-steps-actions .mg-left-1 {\n    margin-left: 1rem; }\n\n.ndc-details .ant-input-number-input-wrap {\n  margin-right: 10px; }\n\n.ndc-details tbody {\n  vertical-align: top; }\n\n.ndc-details td .ant-space-item {\n  margin-top: 5px; }\n\n.ndc-details .ant-table-pagination.ant-pagination {\n  margin-top: 16px;\n  margin-right: 0px;\n  margin-left: 24px;\n  margin-bottom: 0px; }\n\n.ndc-details .ndc-button-row {\n  margin-top: 16px; }\n\n.ndc-details .btn-danger {\n  color: #ff4d4f !important;\n  border-color: #ff8183 !important; }\n";
 styleInject(css_248z$7);
 
 var NdcDetailsActionType;
@@ -28064,7 +28064,7 @@ var NdcDetailsComponent = function (props) {
             }
             else {
                 setActionInfo({
-                    action: "Finalize",
+                    action: "Finalise",
                     headerText: t("ndc:finalizeApproveTitle"),
                     text: t("ndc:finalizeApproveSubTitle"),
                     type: "primary",
@@ -28135,7 +28135,7 @@ var NdcDetailsComponent = function (props) {
                                     !selectedPeriod.finalized && (React.createElement(antd.Row, { justify: "center" },
                                     React.createElement(antd.Button, { className: "btnAddNewMainAct", disabled: isMainActionInEditMode(), onClick: onClickedAddNewNdcDetail, type: "default" }, t("ndc:addNdcAction"))));
                             } })))),
-            isGovernmentUser && selectedPeriod && !selectedPeriod.finalized ? (React.createElement(antd.Row, { justify: "end" }, isMainActionInEditMode() ? (React.createElement(React.Fragment, null,
+            isGovernmentUser && selectedPeriod && !selectedPeriod.finalized ? (React.createElement(antd.Row, { justify: "end", className: "ndc-button-row" }, isMainActionInEditMode() ? (React.createElement(React.Fragment, null,
                 React.createElement(antd.Button, { className: "mg-left-1", disabled: true }, t("ndc:delete")),
                 React.createElement(antd.Button, { className: "mg-left-1", disabled: true }, t("ndc:finalize")))) : (React.createElement(React.Fragment, null,
                 React.createElement(antd.Button, { className: "mg-left-1 btn-danger", onClick: onClickedDeletePeriod, htmlType: "submit", loading: loading }, t("ndc:delete")),
@@ -28165,11 +28165,21 @@ var NdcDetailsComponent = function (props) {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    _a.trys.push([0, 4, , 5]);
-                    if (!(selectedDateRangeRef &&
-                        selectedDateRangeRef.current &&
-                        selectedDateRangeRef.current.startYear &&
-                        selectedDateRangeRef.current.endYear)) return [3 /*break*/, 3];
+                    if (!selectedDateRangeRef ||
+                        !selectedDateRangeRef.current ||
+                        !selectedDateRangeRef.current.startYear ||
+                        !selectedDateRangeRef.current.endYear) {
+                        antd.message.open({
+                            type: "error",
+                            content: t("ndc:invalidYearsSelected"),
+                            duration: 3,
+                            style: { textAlign: "right", marginRight: 15, marginTop: 10 },
+                        });
+                        return [2 /*return*/];
+                    }
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, 5, , 6]);
                     periodItem_1 = {
                         startYear: selectedDateRangeRef.current.startYear,
                         endYear: selectedDateRangeRef.current.endYear,
@@ -28179,27 +28189,28 @@ var NdcDetailsComponent = function (props) {
                         return inRange(periodItem_1.startYear, item.startYear, item.endYear) ||
                             inRange(periodItem_1.endYear, item.startYear, item.endYear);
                     });
-                    if (!(existingIndex === -1)) return [3 /*break*/, 2];
+                    if (!(existingIndex === -1)) return [3 /*break*/, 3];
                     return [4 /*yield*/, post("national/programme/addNdcDetailsPeriod", __assign({}, periodItem_1))];
-                case 1:
+                case 2:
                     response = _a.sent();
                     if (response && response.data) {
                         addedPeriodItem = response.data;
                         updatedPeriodItem_1 = __assign(__assign({}, addedPeriodItem), { key: addedPeriodItem.id, label: "".concat(addedPeriodItem.startYear, "-").concat(addedPeriodItem.endYear) });
                         setPeriodItems(function (items) { return __spreadArray(__spreadArray([], items, true), [updatedPeriodItem_1], false); });
                         setSelectedPeriod(updatedPeriodItem_1);
+                        selectedDateRangeRef.current = null;
                     }
-                    return [3 /*break*/, 3];
-                case 2:
+                    return [3 /*break*/, 4];
+                case 3:
                     antd.message.open({
                         type: "error",
                         content: t("ndc:rangeAlreadyExists"),
                         duration: 3,
                         style: { textAlign: "right", marginRight: 15, marginTop: 10 },
                     });
-                    _a.label = 3;
-                case 3: return [3 /*break*/, 5];
-                case 4:
+                    _a.label = 4;
+                case 4: return [3 /*break*/, 6];
+                case 5:
                     exception_3 = _a.sent();
                     antd.message.open({
                         type: "error",
@@ -28207,8 +28218,8 @@ var NdcDetailsComponent = function (props) {
                         duration: 3,
                         style: { textAlign: "right", marginRight: 15, marginTop: 10 },
                     });
-                    return [3 /*break*/, 5];
-                case 5: return [2 /*return*/];
+                    return [3 /*break*/, 6];
+                case 6: return [2 /*return*/];
             }
         });
     }); };
@@ -28230,6 +28241,12 @@ var NdcDetailsComponent = function (props) {
                 selectedDateRangeRef.current = period;
             }
         }
+        else {
+            selectedDateRangeRef.current = {
+                startYear: range,
+                endYear: range,
+            };
+        }
     };
     var onTabChange = function (key) {
         var selectedPeriod = periodItems.find(function (item) { return item.key === key; });
@@ -28262,7 +28279,7 @@ var NdcDetailsComponent = function (props) {
                     actionResponse = _a.sent();
                     return [3 /*break*/, 9];
                 case 5:
-                    if (!(actionInfo.action === "Finalize")) return [3 /*break*/, 7];
+                    if (!(actionInfo.action === "Finalise")) return [3 /*break*/, 7];
                     return [4 /*yield*/, post("national/programme/finalizeNdcDetailsPeriod", {
                             id: selectedPeriod.key,
                         })];
@@ -28298,7 +28315,7 @@ var NdcDetailsComponent = function (props) {
                             });
                             fetchNdcDetailPeriods();
                         }
-                        else if (actionInfo.action === "Finalize") {
+                        else if (actionInfo.action === "Finalise") {
                             antd.message.open({
                                 type: "success",
                                 content: t("ndc:finalizeSuccessMsg"),