From 8e309a643606d7ee17fc6fa297b0a7e4edc622df Mon Sep 17 00:00:00 2001 From: suryansh-egov Date: Mon, 14 Oct 2024 08:01:26 +0530 Subject: [PATCH] checklist bugs (#1512) Co-authored-by: suryansh-egov --- .../src/components/CreateQuestion.js | 1 + .../src/components/CreateQuestionContext.js | 18 +++++++++++++++--- .../src/pages/employee/CreateChecklist.js | 13 ++++++------- .../src/pages/employee/index.js | 8 ++++++-- 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CreateQuestion.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CreateQuestion.js index 6386a67ec3a..d58c51750a8 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CreateQuestion.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CreateQuestion.js @@ -376,6 +376,7 @@ const CreateQuestion = ({ onSelect, className, level = 1, initialQuestionData, p className={"example"} /> */} { }); break; case "UPDATE_QUESTION_DATA": - return [...action.payload]; + if(action?.payload && action?.payload.length>0) return [...action.payload]; + else return state; case "ADD_QUESTION": return [ ...state, @@ -164,13 +165,18 @@ const CreateQuestionContext = ({ onSelect, ...props }) => { return state; } }; - const [initialState, setInitialState] = useState([{ id: crypto.randomUUID(), parentId: null, level: 1, key: 1, title: null, type: { "code": "SingleValueList" }, value: null, isRequired: false }]) + // const [initialState, setInitialState] = useState([{ id: crypto.randomUUID(), parentId: null, level: 1, key: 1, title: null, type: { "code": "SingleValueList" }, value: null, isRequired: false }]) + + const [initialState, setInitialState] = useState(()=>{ + const savedQuestions = localStorage.getItem("questions"); + return savedQuestions ? JSON.parse(savedQuestions) : [{ id: crypto.randomUUID(), parentId: null, level: 1, key: 1, title: null, type: { "code": "SingleValueList" }, value: null, isRequired: false }] + }) const [questionData, dispatchQuestionData] = useReducer(questionDataReducer, initialState); useEffect(() => { // Avoid dispatch if props haven't changed - if (props?.props?.data !== 0) { + if (props?.props?.data !== 0 && props?.props?.data?.[0]?.title !== null) { // Dispatch only if the data is different dispatchQuestionData({ type: "UPDATE_QUESTION_DATA", @@ -185,6 +191,12 @@ const CreateQuestionContext = ({ onSelect, ...props }) => { onSelect("createQuestion", { questionData, }); + if(!(questionData.length === 1 && questionData?.[0].title===null)) + { + localStorage.setItem("questions", JSON.stringify(questionData)); + + } + // setInitialState(localStorage.getItem("questions")) }, [questionData]); diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/CreateChecklist.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/CreateChecklist.js index d3a8a45f5b7..34108bf82b5 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/CreateChecklist.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/CreateChecklist.js @@ -1,6 +1,6 @@ import React, { useEffect, useState, createContext, useContext } from "react"; -import { ViewCardFieldPair, Toast, Card, TextBlock, Button, PopUp, CardText, FieldV1 } from "@egovernments/digit-ui-components"; -import { FormComposerV2, LabelFieldPair, TextInput, Loader } from "@egovernments/digit-ui-react-components"; +import { ViewCardFieldPair, Toast, Card, TextBlock, Button, PopUp, CardText, TextInput, BreadCrumb, Loader } from "@egovernments/digit-ui-components"; +import { FormComposerV2 } from "@egovernments/digit-ui-react-components"; import { useHistory, useLocation } from "react-router-dom"; import { checklistCreateConfig } from "../../configs/checklistCreateConfig"; import { useTranslation } from "react-i18next"; @@ -451,15 +451,14 @@ module = "HCM";
{t("NAME_OF_CHECKLIST")}
- addChecklistName(event.target.value)} - placeholder={""} + placeholder={"Checklist Name"} />
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/index.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/index.js index ed7cb77cb77..7999788ed8c 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/index.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/index.js @@ -22,7 +22,6 @@ const CampaignBreadCrumb = ({ location, defaultPath }) => { const { t } = useTranslation(); const search = useLocation().search; const pathVar = location.pathname.replace(defaultPath + "/", "").split("?")?.[0]; - const crumbs = [ { path: `/${window?.contextPath}/employee`, @@ -32,7 +31,7 @@ const CampaignBreadCrumb = ({ location, defaultPath }) => { { path: pathVar === "my-campaign" ? "" : `/${window?.contextPath}/employee/campaign/my-campaign`, content: t("MY_CAMPAIGN"), - show: pathVar === "my-campaign" || pathVar === "checklist/search" ? true : false, + show: pathVar === "my-campaign" || pathVar === "checklist/search" || pathVar === "checklist/create" ? true : false, }, { path: pathVar === "setup-campaign" ? "" : `/${window?.contextPath}/employee/campaign/setup-campaign`, @@ -48,6 +47,11 @@ const CampaignBreadCrumb = ({ location, defaultPath }) => { path: "", content: t("ACTION_LABEL_CONFIGURE_APP"), show:pathVar === "checklist/search" ? true : false, + }, + { + path: "", + content: t("ACTION_CREATE_CHECKLIST"), + show: pathVar === "checklist/create" ? true : false, } ];