From c7fee585f8eb5a391aad80e0647a4ae9ea662d66 Mon Sep 17 00:00:00 2001
From: afonso pinto <afonsobspinto@gmail.com>
Date: Fri, 17 Oct 2025 00:10:31 +0100
Subject: [PATCH 1/2] fix: Correct form base spinner logic

---
 .../src/components/Forms/FormBase.tsx         | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/applications/composer/frontend/src/components/Forms/FormBase.tsx b/applications/composer/frontend/src/components/Forms/FormBase.tsx
index a8331e55..ed852ef3 100644
--- a/applications/composer/frontend/src/components/Forms/FormBase.tsx
+++ b/applications/composer/frontend/src/components/Forms/FormBase.tsx
@@ -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);
@@ -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;
   };
 
@@ -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);
@@ -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
@@ -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();
     }
@@ -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>

From c7a377d4c003ded83682bb4c584690601bebe441 Mon Sep 17 00:00:00 2001
From: afonso pinto <afonsobspinto@gmail.com>
Date: Fri, 17 Oct 2025 10:35:48 +0100
Subject: [PATCH 2/2] chore: Bump composer version

---
 applications/composer/frontend/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/composer/frontend/package.json b/applications/composer/frontend/package.json
index 49ef2aaa..de1b433b 100644
--- a/applications/composer/frontend/package.json
+++ b/applications/composer/frontend/package.json
@@ -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/",