Console v0.5 #2965
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| import React, { useState, Fragment, useEffect } from "react"; | ||
| import { TextInput, Dropdown, RadioButtons, Button, FieldV1, Switch, Loader } from "@egovernments/digit-ui-components"; | ||
| import { useTranslation } from "react-i18next"; | ||
| const FiltersRenderer = ({ cField, drawerState, setDrawerState, t, disabled }) => { | ||
| const [localSelectedSchema, setLocalSelectedSchema] = useState(null); | ||
| const [localActiveOptions, setLocalActiveOptions] = useState([]); // store codes | ||
|
|
||
| // Fetch MDMS data based on selected schema | ||
| const { isLoading, data: mdmsOptions = [] } = Digit.Hooks.useCustomMDMS( | ||
| Digit.ULBService.getCurrentTenantId(), | ||
| localSelectedSchema?.moduleName, | ||
| localSelectedSchema?.masterName ? [{ name: localSelectedSchema.masterName }] : [], | ||
| { | ||
| enabled: !!localSelectedSchema?.moduleName && !!localSelectedSchema?.masterName, | ||
| select: (data) => data?.[localSelectedSchema?.moduleName]?.[localSelectedSchema.masterName] || [], | ||
| }, | ||
| { schemaCode: "FILTERSDROPDOWNLIST" } | ||
| ); | ||
|
|
||
| // When MDMS options load, set default active | ||
| useEffect(() => { | ||
| if (mdmsOptions.length > 0) { | ||
| const defaultActive = mdmsOptions.filter((opt) => opt.active).map((opt) => opt.code); | ||
| setLocalActiveOptions(defaultActive); | ||
| // Also initialize enums in drawerState with these active objects | ||
| const activeObjects = mdmsOptions.filter((item) => defaultActive.includes(item.code)); | ||
| setDrawerState((prev) => ({ | ||
| ...prev, | ||
| enums: activeObjects, | ||
| })); | ||
| } | ||
| }, [mdmsOptions]); | ||
|
|
||
| // Handle toggle | ||
| const handleToggle = (code, checked) => { | ||
| setLocalActiveOptions((prev) => { | ||
| let updated = [...prev]; | ||
| if (checked) { | ||
| if (!updated.includes(code)) updated.push(code); | ||
| } else { | ||
| updated = updated.filter((c) => c !== code); | ||
| } | ||
|
|
||
| // Map updated codes to full objects | ||
| const activeObjects = mdmsOptions.filter((item) => updated.includes(item.code)); | ||
|
|
||
| // Update drawerState.enums directly | ||
| setDrawerState((prev) => ({ | ||
| ...prev, | ||
| enums: activeObjects, | ||
| })); | ||
|
|
||
| return updated; | ||
| }); | ||
| }; | ||
|
|
||
| return ( | ||
| <> | ||
| {/* Dropdown for selecting schema */} | ||
| <Dropdown | ||
| variant={""} | ||
| t={t} | ||
| disabled={disabled} | ||
| option={cField?.mdmsOptions || []} | ||
| optionKey={"schemaCode"} | ||
| selected={localSelectedSchema || {}} | ||
| select={(value) => { | ||
| setLocalSelectedSchema(value); | ||
| setLocalActiveOptions([]); // reset active when schema changes | ||
| setDrawerState((prev) => ({ ...prev, enums: [] })); // reset enums | ||
| }} | ||
| /> | ||
|
|
||
| {isLoading && <Loader/>} | ||
|
|
||
| {!isLoading && mdmsOptions.length > 0 && ( | ||
| <div style={{ marginTop: "1rem", display: "flex", flexDirection: "column", gap: "0.5rem" }}> | ||
| {mdmsOptions.map((opt) => { | ||
| const isActive = localActiveOptions.includes(opt.code); | ||
| return ( | ||
| <Switch | ||
| key={opt.code} | ||
| label={t(opt.name)} | ||
| isCheckedInitially={isActive} | ||
| onToggle={(checked) => handleToggle(opt.code, checked)} | ||
| disable={false} | ||
| shapeOnOff | ||
| /> | ||
| ); | ||
| })} | ||
| </div> | ||
| )} | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| export default FiltersRenderer; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -479,6 +479,7 @@ const AppConfigurationParentRedesign = ({ | |
| parentDispatch={parentDispatch} | ||
| AppConfigMdmsData={AppConfigMdmsData} | ||
| localeModule={localeModule} | ||
| parentState={parentState} | ||
| pageTag={`${t("CMN_PAGE")} ${currentStep} / ${stepper?.length}`} | ||
| /> | ||
| </div> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -287,7 +287,7 @@ const reducer = (state = initialState, action, updateLocalization) => { | |
|
|
||
| const MODULE_CONSTANTS = "HCM-ADMIN-CONSOLE"; | ||
|
|
||
| function AppConfigurationWrapper({ screenConfig, localeModule, pageTag,parentState }) { | ||
| const queryClient = useQueryClient(); | ||
| const { locState, addMissingKey, updateLocalization, onSubmit, back, showBack, parentDispatch } = useAppLocalisationContext(); | ||
| const [state, dispatch] = useReducer((state, action) => reducer(state, action, updateLocalization), initialState); | ||
|
|
@@ -395,7 +395,7 @@ function AppConfigurationWrapper({ screenConfig, localeModule, pageTag }) { | |
| for (let i = 0; i < headerFields.length; i++) { | ||
| if (headerFields[i]?.jsonPath === "ScreenHeading") { | ||
| const fieldItem = headerFields[i]; | ||
| const value = (locS ||[])?.find((i) => i?.code === fieldItem?.value)?.[cL] || null; | ||
| if (!value || value.trim() === "") { | ||
| return { type: "error", value: `${t("HEADER_FIELD_EMPTY_ERROR")}` }; | ||
| } | ||
|
|
@@ -633,7 +633,7 @@ function AppConfigurationWrapper({ screenConfig, localeModule, pageTag }) { | |
| }) | ||
| } | ||
| /> | ||
| <DrawerFieldComposer parentState={parentState} screenConfig={screenConfig} selectedField={state?.drawerField}/> | ||
| </> | ||
| ) : ( | ||
| <DndProvider backend={HTML5Backend}> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,7 +38,7 @@ const locReducer = (state = initialState, action) => { | |
|
|
||
| const MODULE_CONSTANTS = "HCM-ADMIN-CONSOLE"; | ||
| //TODO @nabeel @jagan move this component to ui-component repo & clean up | ||
| function AppLocalisationWrapperDev({ onSubmit, localeModule, screenConfig, back, showBack, parentDispatch, parentState,...props }) { | ||
coderabbitai[bot] marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| if (!localeModule) { | ||
| return <Loader />; | ||
| } | ||
|
|
@@ -129,7 +129,7 @@ function AppLocalisationWrapperDev({ onSubmit, localeModule, screenConfig, back, | |
| localeModule, | ||
| }} | ||
| > | ||
| <AppConfigurationWrapper pageTag={props?.pageTag} screenConfig={screenConfig} localeModule={localeModule} parentState={parentState}/> | ||
| </AppLocalisationContext.Provider> | ||
| ); | ||
| } | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dropdown uses prop “disable”, not “disabled” — current control won’t disable
The shared Dropdown component checks props.disable, so passing disabled has no effect. Update to disable to ensure the dropdown can be disabled.
📝 Committable suggestion
🤖 Prompt for AI Agents