Made all mgramseva changes into workbench-develop #1438
There are no files selected for viewing
This file contains 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 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 |
|---|---|---|
| @@ -1,32 +1,32 @@ | ||
| import React, { useState } from "react"; | ||
| import MDMSAdd from "./MDMSAddV2"; | ||
| import { Loader, Toast } from "@egovernments/digit-ui-react-components"; | ||
| import { useTranslation } from "react-i18next"; | ||
| import { useHistory } from "react-router-dom"; | ||
| const MDMSEdit = ({ ...props }) => { | ||
| const history = useHistory(); | ||
|
|
||
| const { t } = useTranslation(); | ||
|
|
||
| const { moduleName, masterName, tenantId, uniqueIdentifier, from } = Digit.Hooks.useQueryParams(); | ||
| const stateId = Digit.ULBService.getCurrentTenantId(); | ||
|
|
||
| const [showToast, setShowToast] = useState(false); | ||
| const [renderLoader, setRenderLoader] = useState(false); | ||
| const reqCriteria = { | ||
| url: `/${Digit.Hooks.workbench.getMDMSContextPath()}/v2/_search`, | ||
| params: {}, | ||
| body: { | ||
| MdmsCriteria: { | ||
| tenantId: stateId, | ||
| uniqueIdentifiers: [uniqueIdentifier], | ||
| schemaCode: `${moduleName}.${masterName}`, | ||
| }, | ||
| }, | ||
| config: { | ||
| enabled: moduleName && masterName && true, | ||
| select: (data) => { | ||
| return data?.mdms?.[0]; | ||
| }, | ||
| }, | ||
| }; | ||
|
|
@@ -37,79 +37,73 @@ const MDMSEdit = ({...props}) => { | |
| body: { | ||
| SchemaDefCriteria: { | ||
| tenantId: stateId, | ||
| codes: [`${moduleName}.${masterName}`], | ||
| }, | ||
| }, | ||
| config: { | ||
| enabled: moduleName && masterName && true, | ||
| select: (data) => { | ||
| const uniqueFields = data?.SchemaDefinitions?.[0]?.definition?.["x-unique"]; | ||
| const updatesToUiSchema = {}; | ||
| uniqueFields.forEach((field) => (updatesToUiSchema[field] = { "ui:readonly": true })); | ||
| return { schema: data?.SchemaDefinitions?.[0], updatesToUiSchema }; | ||
| }, | ||
| }, | ||
| changeQueryName: "schema", | ||
| }; | ||
|
|
||
| const closeToast = () => { | ||
| setTimeout(() => { | ||
| setShowToast(null); | ||
| }, 5000); | ||
| }; | ||
|
|
||
| const gotoView = () => { | ||
| setTimeout(() => { | ||
| setRenderLoader(true); | ||
| history.goBack(); | ||
| }, 2000); | ||
| }; | ||
|
|
||
| const { isLoading, data, isFetching } = Digit.Hooks.useCustomAPIHook(reqCriteria); | ||
| const { isLoading: isLoadingSchema, data: schemaData, isFetching: isFetchingSchema, ...rest } = Digit.Hooks.useCustomAPIHook(reqCriteriaSchema); | ||
|
|
||
| const reqCriteriaUpdate = { | ||
| url: Digit.Utils.workbench.getMDMSActionURL(moduleName, masterName, "update"), | ||
| params: {}, | ||
| body: {}, | ||
| config: { | ||
| enabled: true, | ||
| }, | ||
| }; | ||
| const mutation = Digit.Hooks.useCustomAPIMutationHook(reqCriteriaUpdate); | ||
|
|
||
| const handleUpdate = async (formData) => { | ||
| const onSuccess = (resp) => { | ||
| setShowToast({ | ||
| label: `${t("WBH_SUCCESS_UPD_MDMS_MSG")} ${resp?.mdms?.[0]?.id}`, | ||
| }); | ||
| // closeToast() | ||
| gotoView(); | ||
| }; | ||
|
|
||
| const onError = (resp) => { | ||
| setShowToast({ | ||
| label: `${t("WBH_ERROR_MDMS_DATA")} ${t(resp?.response?.data?.Errors?.[0]?.code)}`, | ||
| isError: true, | ||
| }); | ||
|
|
||
| closeToast(); | ||
| }; | ||
|
|
||
| mutation.mutate( | ||
| { | ||
| url: reqCriteriaUpdate?.url, | ||
| params: {}, | ||
| body: { | ||
| Mdms: { | ||
| ...data, | ||
| data: formData, | ||
| }, | ||
| }, | ||
| }, | ||
|
|
@@ -118,17 +112,16 @@ const MDMSEdit = ({...props}) => { | |
| onSuccess, | ||
| } | ||
| ); | ||
| }; | ||
|
|
||
| if (isLoading || isLoadingSchema || renderLoader) return <Loader />; | ||
|
|
||
| return ( | ||
| <React.Fragment> | ||
| <MDMSAdd defaultFormData={data?.data} screenType={"edit"} onSubmitEditAction={handleUpdate} updatesToUISchema={schemaData?.updatesToUiSchema} /> | ||
| {showToast && <Toast label={t(showToast.label)} error={showToast?.isError} onClose={() => setShowToast(null)}></Toast>} | ||
| </React.Fragment> | ||
| ); | ||
|
Comment on lines
+117
to
+124
There was a problem hiding this comment. 💡 Codebase verification Issue: The
🔗 Analysis chainLGTM: Rendering logic with a new prop. The changes to the rendering logic are mostly formatting improvements that enhance readability. However, there's a notable change:
This addition might affect the behavior of the Please verify that the 🏁 Scripts executedThe following scripts were executed for the analysis: Script: #!/bin/bash
# Description: Check the usage of updatesToUISchema prop in MDMSAdd component
# Test: Search for the MDMSAdd component definition and its usage
rg --type js -A 10 'const MDMSAdd =' micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/
rg --type js -A 5 '<MDMSAdd' micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/
Length of output: 8525 |
||
| }; | ||
|
|
||
| export default MDMSEdit; | ||
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.
🛠️ Refactor suggestion
Refactor conditional check using optional chaining
The conditional statement can be simplified by using optional chaining, enhancing readability and reducing code complexity.
Update the condition as follows:
📝 Committable suggestion
🧰 Tools
🪛 Biome