@undp/carbon-library 1.0.170-CARBON-329.2 → 1.0.171-CARBON-363.0

package/dist/esm/index.js

@@ -24678,7 +24678,7 @@ var EditableRow = function (_a) {
             React.createElement("tr", __assign({}, props)))));
 };
 var EditableCell = function (_a) {
-    var title = _a.title, editable = _a.editable, children = _a.children, dataIndex = _a.dataIndex, record = _a.record, handleSave = _a.handleSave, restProps = __rest(_a, ["title", "editable", "children", "dataIndex", "record", "handleSave"]);
+    _a.title; var editable = _a.editable, children = _a.children, dataIndex = _a.dataIndex, record = _a.record, handleSave = _a.handleSave, restProps = __rest(_a, ["title", "editable", "children", "dataIndex", "record", "handleSave"]);
     var _b = useState(false), editing = _b[0], setEditing = _b[1];
     var inputRef = useRef(null);
     var form = useContext(EditableContext);
@@ -24714,12 +24714,7 @@ var EditableCell = function (_a) {
     }); };
     var childNode = children;
     if (editable) {
-        childNode = editing ? (React.createElement(Form.Item, { style: { margin: 0 }, name: dataIndex, rules: [
-                {
-                    required: true,
-                    message: "".concat(title, " is required."),
-                },
-            ] },
+        childNode = editing ? (React.createElement(Form.Item, { style: { margin: 0 }, name: dataIndex },
             React.createElement(Input, { ref: inputRef, onPressEnter: save, onBlur: save }))) : (React.createElement("div", { className: "editable-cell-value-wrap", style: { paddingRight: 24, minWidth: "100px", minHeight: "20px" }, onClick: toggleEdit }, children));
     }
     return React.createElement("td", __assign({}, restProps), childNode);
@@ -24730,26 +24725,54 @@ styleInject(css_248z$4);
 
 var NdcActionType;
 (function (NdcActionType) {
-    NdcActionType[NdcActionType["main"] = 0] = "main";
-    NdcActionType[NdcActionType["sub"] = 1] = "sub";
+    NdcActionType[NdcActionType["mainAction"] = 0] = "mainAction";
+    NdcActionType[NdcActionType["subAction"] = 1] = "subAction";
 })(NdcActionType || (NdcActionType = {}));
+var NdcDetailsActionStatus;
+(function (NdcDetailsActionStatus) {
+    NdcDetailsActionStatus[NdcDetailsActionStatus["pending"] = 0] = "pending";
+    NdcDetailsActionStatus[NdcDetailsActionStatus["approved"] = 1] = "approved";
+})(NdcDetailsActionStatus || (NdcDetailsActionStatus = {}));
+
 var NdcDetailsComponent = function (props) {
-    var t = props.t; props.useConnection; var useUserContext = props.useUserContext;
+    var t = props.t, useConnection = props.useConnection, useUserContext = props.useUserContext;
     var RangePicker = DatePicker.RangePicker;
     var _a = useState([]), ndcDetailsData = _a[0], setNdcDetailsData = _a[1];
     var _b = useState(false), loading = _b[0]; _b[1];
-    var periodItemsRef = useRef([]);
     var _c = useState([]), periodItems = _c[0], setPeriodItems = _c[1];
-    var _d = useState("add_new"), selectedTab = _d[0], setSelectedTab = _d[1];
-    var selectedPeriod = useRef({});
-    var addedNdcDetailId = useRef(0);
+    var _d = useState({}), selectedPeriod = _d[0], setSelectedPeriod = _d[1];
+    var selectedDateRangeRef = useRef({});
+    useRef(0);
     var selectedNdcDetail = useRef({});
     var _e = useState(0), tableKey = _e[0], setTableKey = _e[1];
+    var _f = useConnection(), get = _f.get, post = _f.post, put = _f.put;
     var userInfoState = useUserContext().userInfoState;
-    var isAddRangeVisible = function () {
-        return (((userInfoState === null || userInfoState === void 0 ? void 0 : userInfoState.companyRole) === CompanyRole.MINISTRY ||
-            (userInfoState === null || userInfoState === void 0 ? void 0 : userInfoState.companyRole) === CompanyRole.GOVERNMENT) &&
-            (userInfoState === null || userInfoState === void 0 ? void 0 : userInfoState.userRole) !== Role.ViewOnly);
+    var governmentMinistry = process.env.REACT_APP_GOVERNMENT_MINISTRY
+        ? process.env.REACT_APP_GOVERNMENT_MINISTRY
+        : "Test ministryName";
+    var isAddRangeVisible = ((userInfoState === null || userInfoState === void 0 ? void 0 : userInfoState.companyRole) === CompanyRole.MINISTRY ||
+        (userInfoState === null || userInfoState === void 0 ? void 0 : userInfoState.companyRole) === CompanyRole.GOVERNMENT) &&
+        (userInfoState === null || userInfoState === void 0 ? void 0 : userInfoState.userRole) !== Role.ViewOnly;
+    var ndcMainDetailsForPeriod = selectedPeriod.key !== "add_new"
+        ? ndcDetailsData.filter(function (ndcDetail) {
+            return (ndcDetail.periodId === parseInt(selectedPeriod.key) &&
+                ndcDetail.actionType === NdcActionType.mainAction);
+        })
+        : [];
+    var getSubNdcDetailsForPeriod = function (id) {
+        var subNdcDetails = ndcDetailsData.filter(function (ndcDetail) {
+            return (ndcDetail.parentActionId === id &&
+                ndcDetail.actionType === NdcActionType.subAction);
+        });
+        var emptySubNdcRow = {
+            actionType: NdcActionType.subAction,
+            nationalPlanObjective: "",
+            kpi: 0,
+            ministryName: governmentMinistry,
+            status: NdcDetailsActionStatus.pending,
+            parentActionId: id,
+        };
+        return __spreadArray(__spreadArray([], subNdcDetails, true), [emptySubNdcRow], false);
     };
     var isAddNdcActionVisible = function () {
         return ((userInfoState === null || userInfoState === void 0 ? void 0 : userInfoState.companyRole) === CompanyRole.GOVERNMENT &&
@@ -24758,103 +24781,37 @@ var NdcDetailsComponent = function (props) {
     var inRange = function (num, min, max) {
         return num >= min && num <= max;
     };
-    function onAddNewSubNdcDetail() {
-        var range = selectedTab.split('-');
-        var ndcDetail = ndcDetailsData.find(function (item) { return item.key === selectedNdcDetail.current.key; });
-        var ndcDetailItemIndex = ndcDetailsData.findIndex(function (item) { return item.key === selectedNdcDetail.current.key; });
-        if (ndcDetail) {
-            addedNdcDetailId.current = addedNdcDetailId.current + 1;
-            var newData = {
-                key: addedNdcDetailId.current,
-                startDate: new Date("".concat(Number(range[0]), "-01-24 23:12:00")),
-                endDate: new Date("".concat(Number(range[0]), "-12-24 23:12:00")),
-                ndcActionId: ndcDetail === null || ndcDetail === void 0 ? void 0 : ndcDetail.key,
-                nationalPlanObj: '',
-                kpi: '',
-                ministry: '',
-            };
-            if (!ndcDetail.subNdcDetails) {
-                ndcDetail.subNdcDetails = [];
-            }
-            ndcDetail.subNdcDetails.push(newData);
-        }
-        ndcDetailsData[ndcDetailItemIndex] = ndcDetail;
-        setNdcDetailsData(ndcDetailsData);
-        setTableKey(function (key) { return key + 1; });
-    }
-    var handleSave = function (row) {
-        setNdcDetailsData(function (prevData) {
-            var newData = JSON.parse(JSON.stringify(prevData));
-            if (row.type === NdcActionType.main) {
-                var index = newData.findIndex(function (item) { return row.key === item.key; });
-                if (index !== -1) {
-                    newData[index] = __assign(__assign({}, newData[index]), row);
-                }
-            }
-            else {
-                var parentIndex = newData.findIndex(function (item) { return row.ndcActionId === item.key; });
-                var parentItem = newData[parentIndex];
-                if (parentItem) {
-                    if (parentItem.subNdcDetails) {
-                        var itemIndex = parentItem.subNdcDetails.findIndex(function (item) { return row.key === item.key; });
-                        if (itemIndex === -1) {
-                            parentItem.subNdcDetails.push(row);
-                        }
-                        else {
-                            parentItem.subNdcDetails[itemIndex] = __assign({}, row);
-                        }
-                    }
-                    else {
-                        parentItem.subNdcDetails = [row];
-                    }
-                }
-                newData[parentIndex] = __assign({}, parentItem);
-                setTableKey(function (key) { return key + 1; });
+    var handleSave = function (row) { return __awaiter(void 0, void 0, void 0, function () {
+        var updatedItemIndex;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    updatedItemIndex = ndcDetailsData.findIndex(function (item) { return item.id === row.id; });
+                    if (!(updatedItemIndex === -1)) return [3 /*break*/, 2];
+                    return [4 /*yield*/, post("national/programme/addNdcDetailsAction", __assign(__assign({}, row), { kpi: parseInt(row.kpi) }))];
+                case 1:
+                    _a.sent();
+                    return [3 /*break*/, 4];
+                case 2: return [4 /*yield*/, put("national/programme/updateNdcDetailsAction", __assign(__assign({}, row), { kpi: parseInt(row.kpi) }))];
+                case 3:
+                    _a.sent();
+                    _a.label = 4;
+                case 4:
+                    fetchNdcDetailActions();
+                    return [2 /*return*/];
             }
-            return newData;
         });
-    };
-    var getNdcDetailsForPeriod = function () {
-        var range = selectedTab.split("-");
-        if (range.length > 1) {
-            var filteredData = ndcDetailsData.filter(function (item) {
-                return inRange(Number(moment(item.startDate).year()), Number(range[0]), Number(range[1]));
-            });
-            return filteredData;
-        }
-        else {
-            return [];
-        }
-    };
-    var getSubNdcDetails = function (key) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-        var ndcDetail = ndcDetailsData.find(function (item) { return item.key === key; });
-        if (ndcDetail) {
-            if (((_b = ndcDetail === null || ndcDetail === void 0 ? void 0 : ndcDetail.subNdcDetails[((_a = ndcDetail === null || ndcDetail === void 0 ? void 0 : ndcDetail.subNdcDetails) === null || _a === void 0 ? void 0 : _a.length) - 1]) === null || _b === void 0 ? void 0 : _b.ministry.trim()) !== '' &&
-                ((_d = ndcDetail === null || ndcDetail === void 0 ? void 0 : ndcDetail.subNdcDetails[((_c = ndcDetail === null || ndcDetail === void 0 ? void 0 : ndcDetail.subNdcDetails) === null || _c === void 0 ? void 0 : _c.length) - 1]) === null || _d === void 0 ? void 0 : _d.ministry) &&
-                ((_f = ndcDetail === null || ndcDetail === void 0 ? void 0 : ndcDetail.subNdcDetails[((_e = ndcDetail === null || ndcDetail === void 0 ? void 0 : ndcDetail.subNdcDetails) === null || _e === void 0 ? void 0 : _e.length) - 1]) === null || _f === void 0 ? void 0 : _f.nationalPlanObj.trim()) !==
-                    '' &&
-                ((_h = ndcDetail === null || ndcDetail === void 0 ? void 0 : ndcDetail.subNdcDetails[((_g = ndcDetail === null || ndcDetail === void 0 ? void 0 : ndcDetail.subNdcDetails) === null || _g === void 0 ? void 0 : _g.length) - 1]) === null || _h === void 0 ? void 0 : _h.nationalPlanObj) &&
-                String((_k = ndcDetail === null || ndcDetail === void 0 ? void 0 : ndcDetail.subNdcDetails[((_j = ndcDetail === null || ndcDetail === void 0 ? void 0 : ndcDetail.subNdcDetails) === null || _j === void 0 ? void 0 : _j.length) - 1]) === null || _k === void 0 ? void 0 : _k.kpi).trim() !== '' &&
-                String((_m = ndcDetail === null || ndcDetail === void 0 ? void 0 : ndcDetail.subNdcDetails[((_l = ndcDetail === null || ndcDetail === void 0 ? void 0 : ndcDetail.subNdcDetails) === null || _l === void 0 ? void 0 : _l.length) - 1]) === null || _m === void 0 ? void 0 : _m.kpi)) {
-                onAddNewSubNdcDetail();
-            }
-            return ndcDetail.subNdcDetails;
-        }
-        else {
-            return [];
-        }
-    };
+    }); };
     var defaultColumns = [
         {
             title: t("ndc:ndcColumnsNationalPlanObj"),
-            dataIndex: "nationalPlanObj",
-            key: "nationalPlanObj",
+            dataIndex: "nationalPlanObjective",
+            key: "nationalPlanObjective",
             align: "left",
             editable: true,
             width: "50%",
-            render: function (_, record) { return (React.createElement(React.Fragment, null, record.nationalPlanObj ? (React.createElement(Space, { size: "middle" },
-                React.createElement("span", null, record.nationalPlanObj))) : (React.createElement("input", { placeholder: "Please add the National Plan Objective", className: "ant-input", type: "text" })))); },
+            render: function (_, record) { return (React.createElement(React.Fragment, null, record.nationalPlanObjective ? (React.createElement(Space, { size: "middle" },
+                React.createElement("span", null, record.nationalPlanObjective))) : (React.createElement("input", { placeholder: "Please add the National Plan Objective", className: "ant-input", type: "text" })))); },
         },
         {
             title: t("ndc:ndcColumnsKpi"),
@@ -24863,18 +24820,18 @@ var NdcDetailsComponent = function (props) {
             align: "left",
             editable: true,
             width: "10%",
-            render: function (_, record) { return (React.createElement(React.Fragment, null, record.nationalPlanObj ? (React.createElement(Space, { size: "middle" },
+            render: function (_, record) { return (React.createElement(React.Fragment, null, record.kpi ? (React.createElement(Space, { size: "middle" },
                 React.createElement("span", null, record.kpi))) : (React.createElement("input", { placeholder: "Enter Kpi", className: "ant-input", type: "text" })))); },
         },
         {
-            title: "Ministry",
-            dataIndex: "ministry",
-            key: "ministry",
+            title: "ministryName",
+            dataIndex: "ministryName",
+            key: "ministryName",
             align: "left",
             editable: true,
             width: "40%",
-            render: function (_, record) { return (React.createElement(React.Fragment, null, record.nationalPlanObj ? (React.createElement(Space, { size: "middle" },
-                React.createElement("span", null, record.ministry))) : (React.createElement("input", { placeholder: "Please add the Ministry name", className: "ant-input", type: "text" })))); },
+            render: function (_, record) { return (React.createElement(React.Fragment, null, record.ministryName ? (React.createElement(Space, { size: "middle" },
+                React.createElement("span", null, record.ministryName))) : (React.createElement("input", { placeholder: "Please add the ministryName name", className: "ant-input", type: "text" })))); },
         },
     ];
     var columns = defaultColumns.map(function (col) {
@@ -24889,31 +24846,37 @@ var NdcDetailsComponent = function (props) {
                 handleSave: handleSave,
             }); } });
     });
-    function onAddNewNdcDetail() {
-        var range = selectedTab.split("-");
-        var ndcActionId = ++addedNdcDetailId.current;
-        var newData = {
-            key: ndcActionId,
-            type: NdcActionType.main,
-            startDate: new Date("".concat(Number(range[0]), "-01-24 23:12:00")),
-            endDate: new Date("".concat(Number(range[0]), "-12-24 23:12:00")),
-            nationalPlanObj: "",
-            kpi: "",
-            ministry: "",
-            subNdcDetails: [
-                {
-                    key: ++addedNdcDetailId.current,
-                    ndcActionId: ndcActionId,
-                    type: NdcActionType.sub,
-                    startDate: new Date("2019-03-25"),
-                    endDate: new Date("2020-03-25"),
-                    nationalPlanObj: "",
-                    kpi: "",
-                    ministry: "",
-                },
-            ],
-        };
-        setNdcDetailsData(__spreadArray(__spreadArray([], ndcDetailsData, true), [newData], false));
+    function onClickedAddNewNdcDetail() {
+        return __awaiter(this, void 0, void 0, function () {
+            var periodId, newData, response, newlyCreatedNdcAction_1;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!(selectedPeriod.key !== "add_new")) return [3 /*break*/, 2];
+                        periodId = parseInt(selectedPeriod.key);
+                        newData = {
+                            actionType: NdcActionType.mainAction,
+                            nationalPlanObjective: "",
+                            kpi: 0,
+                            ministryName: governmentMinistry,
+                            periodId: periodId,
+                            status: NdcDetailsActionStatus.pending,
+                        };
+                        return [4 /*yield*/, post("national/programme/addNdcDetailsAction", __assign({}, newData))];
+                    case 1:
+                        response = _a.sent();
+                        if (response && response.data) {
+                            newlyCreatedNdcAction_1 = response.data;
+                            setNdcDetailsData(function (ndcDetailsData) { return __spreadArray(__spreadArray([], ndcDetailsData, true), [
+                                newlyCreatedNdcAction_1,
+                            ], false); });
+                            setTableKey(function (key) { return key + 1; });
+                        }
+                        _a.label = 2;
+                    case 2: return [2 /*return*/];
+                }
+            });
+        });
     }
     var components = {
         body: {
@@ -24921,346 +24884,155 @@ var NdcDetailsComponent = function (props) {
             cell: EditableCell,
         },
     };
-    //commented because rendering issue
-    function ndcDetailsTableContent() {
-        return (React.createElement("div", null)
-        // <div>
-        //   <Button
-        //     onClick={onAddNewNdcDetail}
-        //     type="primary"
-        //     style={{
-        //       marginBottom: 16,
-        //     }}
-        //   >
-        //     Add a row
-        //   </Button>
-        //   <Table
-        //     components={components}
-        //     rowClassName={() => 'editable-row'}
-        //     bordered
-        //     dataSource={ndcDetailsData}
-        //     columns={columns}
-        //   />
-        // </div>
-        );
-    }
-    var onCancelPeriod = function () { };
-    var onAddNewPeriod = function () {
-        if (selectedPeriod && selectedPeriod.current) {
-            var newPeriodItem_1 = {
-                key: "".concat(selectedPeriod.current.start, "-").concat(selectedPeriod.current.end),
-                label: "".concat(selectedPeriod.current.start, "-").concat(selectedPeriod.current.end),
-                start: selectedPeriod.current.start,
-                end: selectedPeriod.current.end,
-                children: ndcDetailsTableContent(),
-            };
-            var existingIndex = periodItemsRef.current.findIndex(function (item) {
-                return inRange(newPeriodItem_1.start, item.start, item.end) ||
-                    inRange(newPeriodItem_1.end, item.start, item.end);
-            });
-            if (existingIndex === -1) {
-                setPeriodItems(function (items) { return __spreadArray(__spreadArray([], items, true), [newPeriodItem_1], false); });
-                periodItemsRef.current = __spreadArray(__spreadArray([], periodItemsRef.current, true), [newPeriodItem_1], false);
-            }
-            else {
-                message.open({
-                    type: "error",
-                    content: t("ndc:rangeAlreadyExists"),
-                    duration: 3,
-                    style: { textAlign: "right", marginRight: 15, marginTop: 10 },
-                });
+    var onDeletePeriod = function () { return __awaiter(void 0, void 0, void 0, function () {
+        var result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, post("national/programme/deleteNdcDetailsPeriod", {
+                        id: selectedPeriod.key,
+                    })];
+                case 1:
+                    result = _a.sent();
+                    if (result) {
+                        fetchNdcDetailPeriods();
+                    }
+                    return [2 /*return*/];
             }
-        }
+        });
+    }); };
+    var onFinalizePeriod = function () {
+        //
     };
-    useEffect(function () {
-        if (periodItems && periodItems.length > 3) {
-            setSelectedTab(periodItems[periodItems.length - 1].key);
-        }
-    }, [periodItems]);
+    function ndcDetailsTableContent() {
+        return (React.createElement("div", null,
+            React.createElement(Row, null,
+                React.createElement(Col, { span: 24 },
+                    React.createElement(Table, { key: tableKey, rowKey: "id", components: components, rowClassName: function () { return "editable-row"; }, bordered: true, dataSource: ndcMainDetailsForPeriod, columns: columns, expandable: {
+                            expandedRowRender: function (record) { return getSubNdcActionContent(record); },
+                            indentSize: 0,
+                            //defaultExpandedRowKeys: [parseInt(selectedNdcDetail.current.id)],
+                        }, footer: function () {
+                            return isAddNdcActionVisible() && (React.createElement(Row, { justify: "center" },
+                                React.createElement(Button, { onClick: onClickedAddNewNdcDetail, type: "default", style: {
+                                        marginBottom: 16,
+                                        width: "100%",
+                                    } }, t("ndc:addNdcAction"))));
+                        } }))),
+            React.createElement(Row, { justify: "end" },
+                React.createElement(Button, { className: "mg-left-1", type: "primary", onClick: onDeletePeriod, htmlType: "submit", loading: loading }, t("ndc:delete")),
+                React.createElement(Button, { className: "mg-left-1", type: "primary", onClick: onFinalizePeriod, htmlType: "submit", loading: loading }, t("ndc:finalize")))));
+    }
+    var onAddNewPeriod = function () { return __awaiter(void 0, void 0, void 0, function () {
+        var periodItem_1, existingIndex, response, addedPeriodItem, updatedPeriodItem_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!(selectedDateRangeRef && selectedDateRangeRef.current)) return [3 /*break*/, 3];
+                    periodItem_1 = {
+                        startYear: selectedDateRangeRef.current.startYear,
+                        endYear: selectedDateRangeRef.current.endYear,
+                        finalized: false,
+                    };
+                    existingIndex = periodItems.findIndex(function (item) {
+                        return inRange(periodItem_1.startYear, item.startYear, item.endYear) ||
+                            inRange(periodItem_1.endYear, item.startYear, item.endYear);
+                    });
+                    if (!(existingIndex === -1)) return [3 /*break*/, 2];
+                    return [4 /*yield*/, post("national/programme/addNdcDetailsPeriod", __assign({}, periodItem_1))];
+                case 1:
+                    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);
+                    }
+                    return [3 /*break*/, 3];
+                case 2:
+                    message.open({
+                        type: "error",
+                        content: t("ndc:rangeAlreadyExists"),
+                        duration: 3,
+                        style: { textAlign: "right", marginRight: 15, marginTop: 10 },
+                    });
+                    _a.label = 3;
+                case 3: return [2 /*return*/];
+            }
+        });
+    }); };
     var onDateRangeChanged = function (range) {
         var period = {
-            start: Number(moment(range[0]).year()),
-            end: Number(moment(range[1]).year()),
+            startYear: Number(moment(range[0]).year()),
+            endYear: Number(moment(range[1]).year()),
         };
-        selectedPeriod.current = period;
+        selectedDateRangeRef.current = period;
     };
     function addNewPeriodContent() {
         return (React.createElement("div", null,
-            React.createElement(Row, null,
-                React.createElement(RangePicker, { onChange: onDateRangeChanged, picker: "year" })),
-            React.createElement(Row, { className: "mg-top-1" },
-                React.createElement("div", { className: "ndc-steps-actions" },
-                    React.createElement(Button, { type: "primary", onClick: onAddNewPeriod, htmlType: "submit", loading: loading }, t("ndc:submit")),
-                    React.createElement(Button, { className: "back-btn", onClick: onCancelPeriod, loading: loading }, t("ndc:back"))))));
+            React.createElement(Row, { justify: "start", align: "middle", gutter: [16, 16] },
+                React.createElement(Col, { flex: "340px" },
+                    React.createElement(RangePicker, { onChange: onDateRangeChanged, picker: "year" })),
+                React.createElement(Col, { flex: "auto" },
+                    React.createElement(Button, { type: "primary", onClick: onAddNewPeriod, htmlType: "submit", loading: loading }, t("ndc:submit"))))));
     }
     function getSubNdcActionContent(record) {
         selectedNdcDetail.current = record;
-        return (React.createElement(Table, { components: components, rowClassName: function () { return "editable-row"; }, bordered: true, dataSource: getSubNdcDetails(record.key), columns: columns, showHeader: false, pagination: false }));
+        return (React.createElement(Table, { rowKey: "id", components: components, rowClassName: function () { return "editable-row"; }, bordered: true, dataSource: getSubNdcDetailsForPeriod(record.id), columns: columns, showHeader: false, pagination: false }));
     }
     var onTabChange = function (key) {
-        setSelectedTab(key);
+        var selectedPeriod = periodItems.find(function (item) { return item.key === key; });
+        if (selectedPeriod) {
+            setSelectedPeriod(selectedPeriod);
+        }
     };
+    var fetchNdcDetailPeriods = function () { return __awaiter(void 0, void 0, void 0, function () {
+        var periods, addNewTab, response;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    periods = [];
+                    addNewTab = {
+                        key: "add_new",
+                        label: "Add New",
+                        startYear: 0,
+                        endYear: 0,
+                        finalized: false,
+                        deleted: false,
+                    };
+                    return [4 /*yield*/, get("national/programme/queryNdcDetailsPeriod")];
+                case 1:
+                    response = _a.sent();
+                    if (response && response.data) {
+                        periods = response.data.map(function (period) {
+                            return __assign(__assign({}, period), { key: period.id, label: "".concat(period.startYear, "-").concat(period.endYear) });
+                        });
+                    }
+                    if (isAddRangeVisible) {
+                        periods.unshift(addNewTab);
+                    }
+                    setPeriodItems(periods);
+                    setSelectedPeriod(addNewTab);
+                    return [2 /*return*/];
+            }
+        });
+    }); };
+    var fetchNdcDetailActions = function () { return __awaiter(void 0, void 0, void 0, function () {
+        var response;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, get("national/programme/queryNdcDetailsAction")];
+                case 1:
+                    response = _a.sent();
+                    if (response && response.data) {
+                        setNdcDetailsData(response.data);
+                    }
+                    return [2 /*return*/];
+            }
+        });
+    }); };
     useEffect(function () {
-        var defaultNdcDetails = [
-            {
-                key: 1,
-                type: NdcActionType.main,
-                startDate: new Date("2019-03-25"),
-                endDate: new Date("2020-03-25"),
-                nationalPlanObj: "Enhance value addition in key growth opportunities",
-                kpi: 25,
-                ministry: "Ministry of Environment",
-                subNdcDetails: [
-                    {
-                        key: 6,
-                        ndcActionId: 1,
-                        type: NdcActionType.sub,
-                        startDate: new Date("2019-03-25"),
-                        endDate: new Date("2020-03-25"),
-                        nationalPlanObj: "Enhance value addition in key growth opportunities sub details",
-                        kpi: 25,
-                        ministry: "Ministry of Agriculture, Water and Forestry (MAWF)",
-                    },
-                    {
-                        key: 7,
-                        ndcActionId: 1,
-                        type: NdcActionType.sub,
-                        startDate: new Date("2019-03-25"),
-                        endDate: new Date("2020-03-25"),
-                        nationalPlanObj: "",
-                        kpi: "",
-                        ministry: "",
-                    },
-                ],
-            },
-            {
-                key: 2,
-                type: NdcActionType.main,
-                startDate: new Date("2019-03-25"),
-                endDate: new Date("2019-08-25"),
-                nationalPlanObj: "Strengthen the private sector to create 10,000 jobs",
-                kpi: 10500,
-                ministry: "Ministry of Environment",
-                subNdcDetails: [
-                    {
-                        key: 8,
-                        ndcActionId: 2,
-                        type: NdcActionType.sub,
-                        startDate: new Date("2019-03-25"),
-                        endDate: new Date("2020-03-25"),
-                        nationalPlanObj: "",
-                        kpi: "",
-                        ministry: "",
-                    },
-                ],
-            },
-            {
-                key: 12,
-                type: NdcActionType.main,
-                startDate: new Date("2019-03-25"),
-                endDate: new Date("2019-08-25"),
-                nationalPlanObj: "Other",
-                kpi: 10500,
-                ministry: "Ministry of Environment",
-                subNdcDetails: [
-                    {
-                        key: 8,
-                        ndcActionId: 12,
-                        type: NdcActionType.sub,
-                        startDate: new Date("2019-03-25"),
-                        endDate: new Date("2020-03-25"),
-                        nationalPlanObj: "",
-                        kpi: "",
-                        ministry: "",
-                    },
-                ],
-            },
-            {
-                key: 3,
-                type: NdcActionType.main,
-                startDate: new Date("2021-03-25"),
-                endDate: new Date("2022-03-25"),
-                nationalPlanObj: "Consolidate and increase the stock and quality of productive infrastructure by 50%",
-                kpi: 48,
-                ministry: "Ministry of Environment",
-                subNdcDetails: [
-                    {
-                        key: 9,
-                        ndcActionId: 3,
-                        type: NdcActionType.sub,
-                        startDate: new Date("2019-03-25"),
-                        endDate: new Date("2020-03-25"),
-                        nationalPlanObj: "",
-                        kpi: "",
-                        ministry: "",
-                    },
-                ],
-            },
-            {
-                key: 4,
-                type: NdcActionType.main,
-                startDate: new Date("2022-03-25"),
-                endDate: new Date("2022-05-25"),
-                nationalPlanObj: "Enhance the productivity and social wellbeing of the population",
-                kpi: 20,
-                ministry: "Ministry of Environment",
-                subNdcDetails: [
-                    {
-                        key: 10,
-                        ndcActionId: 4,
-                        type: NdcActionType.sub,
-                        startDate: new Date("2019-03-25"),
-                        endDate: new Date("2020-03-25"),
-                        nationalPlanObj: "",
-                        kpi: "",
-                        ministry: "",
-                    },
-                ],
-            },
-            {
-                key: 5,
-                type: NdcActionType.main,
-                startDate: new Date("2022-03-25"),
-                endDate: new Date("2023-03-25"),
-                nationalPlanObj: "Strengthen the role of the state in guiding and facilitating development",
-                kpi: 10,
-                ministry: "Ministry of Environment",
-                subNdcDetails: [
-                    {
-                        key: 11,
-                        ndcActionId: 5,
-                        type: NdcActionType.sub,
-                        startDate: new Date("2019-03-25"),
-                        endDate: new Date("2020-03-25"),
-                        nationalPlanObj: "",
-                        kpi: "",
-                        ministry: "",
-                    },
-                ],
-            },
-            {
-                key: 13,
-                type: NdcActionType.main,
-                startDate: new Date("2022-03-25"),
-                endDate: new Date("2023-03-25"),
-                nationalPlanObj: "Convert to solar energy",
-                kpi: 50000,
-                ministry: "Ministry of Environment",
-                subNdcDetails: [
-                    {
-                        key: 11,
-                        ndcActionId: 13,
-                        type: NdcActionType.sub,
-                        startDate: new Date("2019-03-25"),
-                        endDate: new Date("2020-03-25"),
-                        nationalPlanObj: "Convert to solar energy",
-                        kpi: "3000",
-                        ministry: "Ministry of Agriculture, Water and Forestry (MAWF)",
-                    },
-                    {
-                        key: 14,
-                        ndcActionId: 13,
-                        type: NdcActionType.sub,
-                        startDate: new Date("2019-03-25"),
-                        endDate: new Date("2020-03-25"),
-                        nationalPlanObj: "",
-                        kpi: "",
-                        ministry: "",
-                    },
-                ],
-            },
-            {
-                key: 15,
-                type: NdcActionType.main,
-                startDate: new Date("2022-03-25"),
-                endDate: new Date("2023-03-25"),
-                nationalPlanObj: "Strengthen the private sector to create jobs",
-                kpi: 10000,
-                ministry: "Ministry of Environment",
-                subNdcDetails: [
-                    {
-                        key: 16,
-                        ndcActionId: 15,
-                        type: NdcActionType.sub,
-                        startDate: new Date("2019-03-25"),
-                        endDate: new Date("2020-03-25"),
-                        nationalPlanObj: "Strengthen the private sector to create jobs",
-                        kpi: "7200",
-                        ministry: "Ministry of Tourism (MoT)",
-                    },
-                    {
-                        key: 17,
-                        ndcActionId: 15,
-                        type: NdcActionType.sub,
-                        startDate: new Date("2019-03-25"),
-                        endDate: new Date("2020-03-25"),
-                        nationalPlanObj: "",
-                        kpi: "",
-                        ministry: "",
-                    },
-                ],
-            },
-            {
-                key: 18,
-                type: NdcActionType.main,
-                startDate: new Date("2022-03-25"),
-                endDate: new Date("2023-03-25"),
-                nationalPlanObj: "Other",
-                kpi: '',
-                ministry: "Ministry of Environment",
-                subNdcDetails: [
-                    {
-                        key: 19,
-                        ndcActionId: 18,
-                        type: NdcActionType.sub,
-                        startDate: new Date("2019-03-25"),
-                        endDate: new Date("2020-03-25"),
-                        nationalPlanObj: "Strengthen the private sector to create jobs",
-                        kpi: "",
-                        ministry: "Ministry of Agriculture, Water and Forestry (MAWF)",
-                    },
-                    {
-                        key: 20,
-                        ndcActionId: 18,
-                        type: NdcActionType.sub,
-                        startDate: new Date("2019-03-25"),
-                        endDate: new Date("2020-03-25"),
-                        nationalPlanObj: "",
-                        kpi: "",
-                        ministry: "",
-                    },
-                ],
-            },
-        ];
-        var initialPeriods = [
-            {
-                key: "2019-2020",
-                label: "2019-2020",
-                start: 2019,
-                end: 2020,
-                children: ndcDetailsTableContent(),
-            },
-            {
-                key: "2021-2023",
-                label: "2021-2023",
-                start: 2021,
-                end: 2021,
-                children: ndcDetailsTableContent(),
-            },
-        ];
-        if (isAddRangeVisible()) {
-            initialPeriods.unshift({
-                key: "add_new",
-                label: "Add New",
-                start: 0,
-                end: 0,
-                children: addNewPeriodContent(),
-            });
-        }
-        addedNdcDetailId.current = 20;
-        setPeriodItems(initialPeriods);
-        periodItemsRef.current = initialPeriods;
-        setNdcDetailsData(defaultNdcDetails);
+        fetchNdcDetailPeriods();
+        fetchNdcDetailActions();
     }, []);
     return (React.createElement("div", { className: "ndc-management content-container" },
         React.createElement("div", { className: "title-bar" },
@@ -25269,20 +25041,10 @@ 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: selectedTab, onChange: onTabChange })),
-        selectedTab !== "add_new" && (React.createElement("div", null,
-            React.createElement("div", null,
-                React.createElement(Table, { key: tableKey, components: components, rowClassName: function () { return "editable-row"; }, bordered: true, dataSource: getNdcDetailsForPeriod(), columns: columns, expandable: {
-                        expandedRowRender: function (record) { return getSubNdcActionContent(record); },
-                        indentSize: 0,
-                        defaultExpandedRowKeys: [selectedNdcDetail.current.key],
-                    }, footer: function () {
-                        return isAddNdcActionVisible() && (React.createElement(Row, { justify: "center" },
-                            React.createElement(Button, { onClick: onAddNewNdcDetail, type: "default", style: {
-                                    marginBottom: 16,
-                                    width: "100%",
-                                } }, t("ndc:addNdcAction"))));
-                    } }))))));
+            React.createElement(Tabs, { centered: false, defaultActiveKey: "1", items: periodItems, activeKey: selectedPeriod.key, onChange: onTabChange })),
+        React.createElement("div", null, selectedPeriod.key === "add_new"
+            ? addNewPeriodContent()
+            : ndcDetailsTableContent())));
 };
 
 var ImgWithFallback = function (_a) {