WIP ui: migrate to react-formule #2878

miguelgrc · 2024-02-22T14:30:21Z

DO NOT MERGE YET (testing in cap-dev)

This PR supersedes #2859

Closes #2688, #2891

codecov-commenter · 2024-02-23T13:44:17Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 75.08%. Comparing base (5f2b9fd) to head (189f7e7).
Report is 2 commits behind head on master.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #2878      +/-   ##
==========================================
+ Coverage   75.05%   75.08%   +0.02%     
==========================================
  Files         194      194              
  Lines        7983     7983              
==========================================
+ Hits         5992     5994       +2     
+ Misses       1991     1989       -2

see 1 file with indirect coverage changes

Signed-off-by: Miguel Garcia Garcia <miguel.garcia.garcia@cern.ch>

pamfilos · 2024-09-24T13:36:38Z

ui/cap-react/src/style.less

+}
+
+.__PublishedForm__ {


should we add in formule? is it needed with new updates on published perview?

In fact we shouldn't need this anymore since we will replace this view with the published version of fields (for TextArea it will just be a string instead of a disabled TextArea)

pamfilos · 2024-09-24T14:08:10Z

ui/cap-react/src/antd/forms/customFields/services/CAPDeposit.js


 const CAPDeposit = ({ data }) => {
  const [showModal, setShowModal] = useState(false);

+  console.log(JSON.stringify(data, null, 2));


pamfilos · 2024-09-24T14:08:51Z

ui/cap-react/src/antd/forms/customFields/services/CAPDeposit.js

+          lang="json"
+          initialValue={JSON.stringify(data, null, 2)}
+          lint="json"
+          isEditable={false} // TODO: Change to !isEditable?


should we add issue for future fix?

Not needed, actually I'll just switch to a CodeViewer here instead since we don't need to edit

pamfilos · 2024-09-24T14:29:26Z

ui/cap-react/src/antd/admin/components/AdminPanel.js

-      pathname.startsWith(CMS_NEW)
-        ? schema.size == 0 && schemaInit()
-        : getSchema(schema_name, schema_version);
+    if (schema_name == "new") {


maybe add issue to handle this better in the future

pamfilos · 2024-09-24T14:33:28Z

ui/cap-react/src/antd/admin/components/CreateForm.js

+const CreateForm = ({ history }) => {
+  const onFinish = content => {
+    let { name, description } = content;
+    const config = { config: { fullname: name } };


add issue to fix structure of data (config, name, schema, etc)

Also added it to the same issue #2898

pamfilos · 2024-09-24T14:47:47Z

ui/cap-react/src/antd/admin/permissions/Permissions.js

@@ -27,21 +27,7 @@ import {
 } from "@ant-design/icons";

 import { configSchema } from "../utils/schemaSettings";
-import Form from "../../forms/Form";
-
-// const initialStatePermissions = Map({


maybe leave as documentation

pamfilos · 2024-09-25T13:20:32Z

ui/cap-react/src/antd/admin/components/Header.js

@@ -61,38 +60,42 @@ const Header = ({
    const a = document.createElement("a");
    const file = new Blob([fileData], { type: "text/json" });
    a.href = URL.createObjectURL(file);
-    a.download = "fileName.json"; //TODO: Should be a proper name
+    a.download = `${config.toJS().name || "cap-schema"}-export-v${
+      config.toJS().version


fix since it appends undefined when version doesnt exist

pamfilos · 2024-09-25T13:30:25Z

ui/cap-react/src/antd/admin/notifications/components/NotificationEdit.js

 import { schema, uiSchema } from "../utils";
 import { DeleteOutlined } from "@ant-design/icons";
+import { FormuleForm } from "react-formule";


we should update schema/uiSchema to work in notification creation

update schema

check that pathSuggester field works

pamfilos · 2024-09-25T13:32:18Z

ui/cap-react/src/antd/admin/permissions/Permissions.js

-//     review: { users: [], roles: [] },
-//   },
-// });
+import { FormuleForm } from "react-formule";


we should update the getSchemaPermissions to return correct (empty?) value when schema is new

pamfilos · 2024-09-25T14:50:38Z

bump react-formule version

Signed-off-by: Miguel Garcia Garcia <miguel.garcia.garcia@cern.ch>

miguelgrc mentioned this pull request Feb 22, 2024

WIP ui: externalize form builder #2859

Closed

miguelgrc changed the title ~~ui: migrate to react-formule~~ WIP ui: migrate to react-formule Feb 22, 2024

miguelgrc force-pushed the with-formule branch 3 times, most recently from 294a4c8 to de99133 Compare February 23, 2024 13:40

miguelgrc force-pushed the with-formule branch 23 times, most recently from 7ced7a8 to 83c3340 Compare February 27, 2024 15:21

miguelgrc force-pushed the with-formule branch from 83c3340 to a695479 Compare May 2, 2024 12:12

miguelgrc force-pushed the with-formule branch 8 times, most recently from 4732167 to f319487 Compare May 10, 2024 10:40

miguelgrc added 3 commits May 15, 2024 10:06

ui: remove form builder components

34486cc

Signed-off-by: Miguel Garcia Garcia <miguel.garcia.garcia@cern.ch>

ui: use formule from npm

34e718c

Signed-off-by: Miguel Garcia Garcia <miguel.garcia.garcia@cern.ch>

devops: fix harbor build action

055af51

Signed-off-by: Miguel Garcia Garcia <miguel.garcia.garcia@cern.ch>

miguelgrc force-pushed the with-formule branch from f319487 to 055af51 Compare May 15, 2024 10:28

ui: bump react-formule to 1.0.0

812ca0f

Signed-off-by: Miguel Garcia Garcia <miguel.garcia.garcia@cern.ch>

miguelgrc force-pushed the with-formule branch from 801172a to 812ca0f Compare May 15, 2024 11:08

miguelgrc added 7 commits August 14, 2024 11:29

ui: remove codemirror and use formule's instead

58a00e6

Signed-off-by: Miguel Garcia Garcia <miguel.garcia.garcia@cern.ch>

ui: pass transformErrors to FormuleForm

0474c5e

Signed-off-by: Miguel Garcia Garcia <miguel.garcia.garcia@cern.ch>

ui: simplify local setup

7e2eeb8

Signed-off-by: Miguel Garcia Garcia <miguel.garcia.garcia@cern.ch>

ui: bump formule to v1.1.1

85d9ddc

Signed-off-by: Miguel Garcia Garcia <miguel.garcia.garcia@cern.ch>

ui: small style tweaks

8097af5

Signed-off-by: Miguel Garcia Garcia <miguel.garcia.garcia@cern.ch>

ui: add back transformMixedEsModules

bd6caf6

Signed-off-by: Miguel Garcia Garcia <miguel.garcia.garcia@cern.ch>

ui: bump node to v20 for actions

114b3de

Signed-off-by: Miguel Garcia Garcia <miguel.garcia.garcia@cern.ch>

pamfilos requested changes Sep 25, 2024

View reviewed changes

miguelgrc force-pushed the with-formule branch from f26fb78 to a918d29 Compare September 30, 2024 08:51

miguelgrc added 2 commits October 2, 2024 17:01

ui: bump formule to 1.2

a38e91e

Signed-off-by: Miguel Garcia Garcia <miguel.garcia.garcia@cern.ch>

ui: fix redirection after saving in editor

61c4524

Signed-off-by: Miguel Garcia Garcia <miguel.garcia.garcia@cern.ch>

miguelgrc force-pushed the with-formule branch from cf6337e to 61c4524 Compare October 2, 2024 15:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP ui: migrate to react-formule #2878

WIP ui: migrate to react-formule #2878

miguelgrc commented Feb 22, 2024 •

edited

Loading

codecov-commenter commented Feb 23, 2024 •

edited

Loading

pamfilos Sep 24, 2024

miguelgrc Sep 26, 2024

pamfilos Sep 24, 2024

pamfilos Sep 24, 2024

miguelgrc Sep 26, 2024

pamfilos Sep 24, 2024

miguelgrc Sep 26, 2024

pamfilos Sep 24, 2024

miguelgrc Sep 26, 2024

pamfilos Sep 24, 2024

pamfilos Sep 25, 2024

pamfilos Sep 25, 2024

pamfilos Sep 25, 2024

pamfilos commented Sep 25, 2024

		}

		.__PublishedForm__ {

WIP ui: migrate to react-formule #2878

Are you sure you want to change the base?

WIP ui: migrate to react-formule #2878

Conversation

miguelgrc commented Feb 22, 2024 • edited Loading

codecov-commenter commented Feb 23, 2024 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pamfilos commented Sep 25, 2024

miguelgrc commented Feb 22, 2024 •

edited

Loading

codecov-commenter commented Feb 23, 2024 •

edited

Loading