Skip to content

Commit

Permalink
Merge pull request #10 from shuhaib-aot/merge-alhpa
Browse files Browse the repository at this point in the history
conflict remove and new pull
  • Loading branch information
abhilash-aot authored Apr 26, 2023
2 parents 24a577b + 823ef4e commit b60eb08
Show file tree
Hide file tree
Showing 11 changed files with 76 additions and 120 deletions.
22 changes: 12 additions & 10 deletions forms-flow-web/craco.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
const SingleSpaAppcracoPlugin = require('craco-plugin-single-spa-application');
const SingleSpaAppcracoPlugin = require("craco-plugin-single-spa-application");

const shouldMinimize = process.env.NODE_ENV !== "development";

const singleSpaAppPlugin = {
plugin: SingleSpaAppcracoPlugin,
Expand All @@ -8,18 +10,18 @@ const singleSpaAppPlugin = {
entry: "src/single-spa-index.js", //defaults to src/index.js,
orgPackagesAsExternal: true, // defaults to false. marks packages that has @my-org prefix as external so they are not included in the bundle
reactPackagesAsExternal: true, // defaults to true. marks react and react-dom as external so they are not included in the bundle
minimize: true, // defaults to false, sets optimization.minimize value
outputFilename: "single-spa-build.js" // defaults to the values set for the "orgName" and "projectName" properties, in this case "my-org-my-app.js"
minimize: shouldMinimize, // defaults to false, sets optimization.minimize value
outputFilename: "single-spa-build.js", // defaults to the values set for the "orgName" and "projectName" properties, in this case "my-org-my-app.js"
},
};

// Keep any other configuration you are exporting from CRACO and add the plugin to the plugins array
module.exports = {
plugins: [singleSpaAppPlugin],
devServer: {
port: 3001,
headers: {
"Access-Control-Allow-Origin": "*",
},
plugins: [singleSpaAppPlugin],
devServer: {
port: 3001,
headers: {
"Access-Control-Allow-Origin": "*",
},
};
},
};
99 changes: 47 additions & 52 deletions forms-flow-web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

55 changes: 1 addition & 54 deletions forms-flow-web/src/components/Form/Item/Edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,60 +122,7 @@ const Edit = React.memo(() => {
}
}, [processListData]);




useEffect(() => {
if (processListData?.parentFormId && !formHistory.length) {
getFormHistory(processListData?.parentFormId).then((res) => {
dispatch(setFormHistories(res.data));
}).catch(() => {
setFormHistories([]);
});
}
}, [processListData]);




useEffect(() => {
if (processListData?.parentFormId && !formHistory.length) {
getFormHistory(processListData?.parentFormId).then((res) => {
dispatch(setFormHistories(res.data));
}).catch(() => {
setFormHistories([]);
});
}
}, [processListData]);




useEffect(() => {
if (processListData?.parentFormId && !formHistory.length) {
getFormHistory(processListData?.parentFormId).then((res) => {
dispatch(setFormHistories(res.data));
}).catch(() => {
setFormHistories([]);
});
}
}, [processListData]);




useEffect(() => {
if (processListData?.parentFormId && !formHistory.length) {
getFormHistory(processListData?.parentFormId).then((res) => {
dispatch(setFormHistories(res.data));
}).catch(() => {
setFormHistories([]);
});
}
}, [processListData]);





useEffect(() => {
if (restoredFormId) {
Expand Down
Empty file.
Loading

0 comments on commit b60eb08

Please sign in to comment.