cleanup

Author: antoine

resources/js/Pages/Form/Form.vue

@@ -59,8 +59,6 @@
 
         <SharpForm
             :form="form"
-            :entity-key="entityKey"
-            :instance-id="instanceId"
             :show-error-alert="Object.values(props.errors).length > 0"
             @submit="submit"
         >

resources/js/commands/components/CommandFormModal.vue

@@ -48,8 +48,6 @@
                 <div>
                     <SharpForm
                         :post-fn="(data) => commands.postForm(data)"
-                        :entity-key="commands.state.currentCommandEndpoints.entityKey"
-                        :instance-id="commands.state.currentCommandEndpoints.instanceId"
                         :form="commands.state.currentCommandForm"
                         @loading="(loading) => commands.state.currentCommandFormLoading = loading"
                         :key="`form-${currentFormUpdatedKey}`"

resources/js/form/components/Form.vue

@@ -22,8 +22,6 @@
 
     const props = defineProps<{
         form: Form
-        entityKey: string,
-        instanceId?: string | number,
         inline?: boolean,
         postFn?: (data: FormData['data']) => Promise<ApiResponse<any>>,
         showErrorAlert?: boolean,

resources/js/form/components/fields/editor/Editor.vue

@@ -183,17 +183,21 @@
                 <EditorContent :editor="editor" :key="locale ?? 'editor'" />
             </EditorAttributes>
 
-            <EditorUploadModal
-                :field="field"
-                :editor="editor"
-                ref="uploadModal"
-            />
+            <template v-if="props.field.uploads">
+                <EditorUploadModal
+                    :field="field"
+                    :editor="editor"
+                    ref="uploadModal"
+                />
+            </template>
 
-            <EditorEmbedModal
-                :editor="editor"
-                :field="field"
-                ref="embedModal"
-            />
+            <template v-if="props.field.embeds">
+                <EditorEmbedModal
+                    :editor="editor"
+                    :field="field"
+                    ref="embedModal"
+                />
+            </template>
 
                 <!-- Commenting this for now because it causes infinite loop on HMR -->
 

resources/js/form/components/fields/editor/extensions/embed/EditorEmbedModal.vue

@@ -74,8 +74,6 @@
             </DialogHeader>
 
             <SharpForm
-                :entity-key="parentForm.entityKey"
-                :instance-id="parentForm.instanceId"
                 :form="modalEmbed?.form"
                 :post-fn="postForm"
                 inline

resources/js/types/generated.d.ts

@@ -108,7 +108,6 @@ export type EmbedData = {
   tag: string;
   icon: IconData | null;
   attributes: Array<string>;
-  template: string;
   fields: { [key: string]: FormFieldData };
 };
 export type EmbedFormData = {
@@ -334,7 +333,7 @@ export type FormEditorFieldData = {
   markdown: boolean;
   inline: boolean;
   showCharacterCount: boolean;
-  uploads: FormEditorFieldUploadData;
+  uploads: FormEditorFieldUploadData | null;
   embeds: { [embedKey: string]: EmbedData };
   toolbar: Array<FormEditorToolbarButton>;
   maxHeight: number | null;

src/Data/Form/Fields/FormEditorFieldData.php

@@ -29,7 +29,7 @@ public function __construct(
         public bool $markdown,
         public bool $inline,
         public bool $showCharacterCount,
-        #[TypeScriptType(FormEditorFieldUploadData::class)]
+        #[LiteralTypeScriptType('FormEditorFieldUploadData | null')]
         public ?array $uploads = null,
         #[LiteralTypeScriptType('{ [embedKey:string]:EmbedData }')]
         public ?array $embeds = null,