Skip to content

Release/5.2.3 #522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
afonsobspinto merged 2 commits into from
Oct 17, 2025
Merged

Release/5.2.3 #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7fee58
fix: Correct form base spinner logic
afonsobspinto Oct 16, 2025
c7a377d
chore: Bump composer version
afonsobspinto Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion applications/composer/frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "frontend",
"version": "5.2.0",
"version": "5.2.3",
"private": true,
"main": "index.js",
"proxy": "http://127.0.0.1:8000/",
Expand Down
32 changes: 16 additions & 16 deletions applications/composer/frontend/src/components/Forms/FormBase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React, {useRef, useState, useEffect} from "react";
import React, { useRef, useState, useEffect } from "react";
import validator from "@rjsf/validator-ajv8";
import {IChangeEvent, withTheme} from "@rjsf/core";
import {Backdrop, Box, CircularProgress} from "@mui/material";
import {Theme} from "@rjsf/mui";
import {EDIT_DEBOUNCE} from "../../settings";
import { IChangeEvent, withTheme } from "@rjsf/core";
import { Backdrop, Box, CircularProgress } from "@mui/material";
import { Theme } from "@rjsf/mui";
import { EDIT_DEBOUNCE } from "../../settings";
import Button from "@mui/material/Button";

const Form = withTheme(Theme);
Expand Down Expand Up @@ -46,7 +46,7 @@ export const FormBase = (props: any) => {

const submitButtonRef = useRef<any>(null);
const removeProp = (obj: any, prop: string) => {
const {[prop]: removedProp, ...newObj} = obj;
const { [prop]: removedProp, ...newObj } = obj;
return newObj;
};

Expand All @@ -73,11 +73,11 @@ export const FormBase = (props: any) => {
}, [data, schema, uiFields, uiSchema]);

const startTimer = () =>
(timer.current = setTimeout(() => {
if (enableAutoSave) {
onSave();
}
}, EDIT_DEBOUNCE));
(timer.current = setTimeout(() => {
if (enableAutoSave) {
onSave();
}
}, EDIT_DEBOUNCE));

const stopTimer = () => {
clearTimeout(timer.current);
Expand All @@ -104,7 +104,7 @@ export const FormBase = (props: any) => {
};

const handleSubmit = async (event: IChangeEvent) => {
const formData = {...event.formData, ...extraData};
const formData = { ...event.formData, ...extraData };
const saveOptions = onSaveCancel ? { onCancel: onSaveCancel } : {};
setIsSaving(true);
service
Expand All @@ -130,7 +130,7 @@ export const FormBase = (props: any) => {
};

const handleUpdate = async (event: IChangeEvent, id: any) => {
const formData = {...event.formData, ...extraData};
const formData = { ...event.formData, ...extraData };
if (submitOnBlurFields.some((field: string) => id && id.includes(field))) {
resetTimer();
}
Expand Down Expand Up @@ -160,12 +160,12 @@ export const FormBase = (props: any) => {
}
};

const showSpinner = isLoading || isSaving || !data;
const showSpinner = isLoading || isSaving;
return (
<>
{showSpinner && (
{(!data || showSpinner) && (
<Backdrop open={showSpinner}>
<CircularProgress color="inherit"/>
<CircularProgress color="inherit" />
</Backdrop>
)}
<Box>
Expand Down
Loading