);
diff --git a/packages/design/src/FormManager/FormEdit/store.tsx b/packages/design/src/FormManager/FormEdit/store.tsx
index 02d4ed65..546b2193 100644
--- a/packages/design/src/FormManager/FormEdit/store.tsx
+++ b/packages/design/src/FormManager/FormEdit/store.tsx
@@ -31,14 +31,15 @@ export const FormEditProvider = (props: {
type FormEditState = {
context: FormEditUIContext;
form: Blueprint;
- selectedPattern?: Pattern;
+ focusedPattern?: Pattern;
availablePatterns: {
patternType: string;
displayName: string;
}[];
addPattern: (patternType: string) => void;
- handleEditClick: (patternId: PatternId) => void;
+ deleteSelectedPattern: () => void;
+ setFocus: (patternId: PatternId) => void;
setSelectedPattern: (element?: Pattern) => void;
updatePattern: (data: Pattern) => void;
updateSelectedPattern: (formData: PatternMap) => void;
@@ -64,18 +65,28 @@ const createFormEditStore = ({
const state = get();
const builder = new BlueprintBuilder(state.form);
const newPattern = builder.addPattern(state.context.config, patternType);
- set({ form: builder.form, selectedPattern: newPattern });
+ set({ form: builder.form, focusedPattern: newPattern });
},
- handleEditClick: (patternId: PatternId) => {
+ deleteSelectedPattern: () => {
const state = get();
- if (state.selectedPattern?.id === patternId) {
- set({ selectedPattern: undefined });
- } else {
- const elementToSet = getPattern(state.form, patternId);
- set({ selectedPattern: elementToSet });
+ if (state.focusedPattern === undefined) {
+ return;
+ }
+ const builder = new BlueprintBuilder(state.form);
+ console.log('delete', state.focusedPattern.id);
+ builder.removePattern(state.context.config, state.focusedPattern.id);
+ set({ focusedPattern: undefined, form: builder.form });
+ console.log(builder.form);
+ },
+ setFocus: (patternId: PatternId) => {
+ const state = get();
+ if (state.focusedPattern?.id === patternId) {
+ return;
}
+ const elementToSet = getPattern(state.form, patternId);
+ set({ focusedPattern: elementToSet });
},
- setSelectedPattern: selectedPattern => set({ selectedPattern }),
+ setSelectedPattern: focusedPattern => set({ focusedPattern }),
updatePattern: (pattern: Pattern) => {
const state = get();
const builder = new BlueprintBuilder(state.form);
@@ -87,23 +98,23 @@ const createFormEditStore = ({
}
);
if (success) {
- set({ form: builder.form, selectedPattern: undefined });
+ set({ form: builder.form, focusedPattern: undefined });
}
},
updateSelectedPattern: (formData: PatternMap) => {
const state = get();
- if (state.selectedPattern === undefined) {
+ if (state.focusedPattern === undefined) {
console.warn('No selected element');
return;
}
const builder = new BlueprintBuilder(state.form);
const success = builder.updatePattern(
state.context.config,
- state.selectedPattern,
+ state.focusedPattern,
formData
);
if (success) {
- set({ form: builder.form, selectedPattern: undefined });
+ set({ form: builder.form, focusedPattern: undefined });
}
},
}));
diff --git a/packages/design/src/FormManager/FormPreview/index.tsx b/packages/design/src/FormManager/FormPreview/index.tsx
index 7dd933f8..cb429bad 100644
--- a/packages/design/src/FormManager/FormPreview/index.tsx
+++ b/packages/design/src/FormManager/FormPreview/index.tsx
@@ -13,7 +13,7 @@ export default function FormPreview({
form: Blueprint;
}) {
const session = createFormSession(form);
- return
;
+ return
;
}
export const FormPreviewById = ({
diff --git a/packages/design/src/FormManager/ManagerNav.tsx b/packages/design/src/FormManager/ManagerNav.tsx
new file mode 100644
index 00000000..85efd6f0
--- /dev/null
+++ b/packages/design/src/FormManager/ManagerNav.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+
+export default function ManagerNav() {
+ return (
+
+
+ -
+
+ Upload completed
+
+
+ -
+
+ Create completed
+
+
+ -
+ Configure
+
+ -
+
+ Publish not completed
+
+
+
+ {/*
+ {(isPreviewPage || isEditPage || isImportDocuments) && (
+ -
+
+ {isImportDocuments ? 'Back to Edit Page' : 'Edit'}
+
+
+ )}
+ -
+ View all Forms
+
+
*/}
+
+ );
+}
diff --git a/packages/design/src/FormManager/import-document.tsx b/packages/design/src/FormManager/import-document.tsx
index 66f85ace..84c7d81a 100644
--- a/packages/design/src/FormManager/import-document.tsx
+++ b/packages/design/src/FormManager/import-document.tsx
@@ -1,19 +1,19 @@
import React from 'react';
-import { FormConfig } from '@atj/forms';
import { type FormService } from '@atj/form-service';
+import { type FormUIContext } from '../Form';
import DocumentImporter from './DocumentImporter';
-import InnerPageTopNav from './internalPageTopNav';
+import ManagerNav from './ManagerNav';
export const FormDocumentImport = ({
baseUrl,
- config,
+ context,
formId,
formService,
}: {
baseUrl: string;
- config: FormConfig;
+ context: FormUIContext;
formId: string;
formService: FormService;
}) => {
@@ -24,9 +24,9 @@ export const FormDocumentImport = ({
}
return (
<>
-
+
-
-
- {(isPreviewPage || isEditPage || isImportDocuments) && (
- -
-
- {isImportDocuments ? 'Back to Edit Page' : 'Edit'}
-
-
- )}
- {/* {(isPreviewPage || isEditPage) && (
- -
- Preview
-
- )} */}
- -
- View all Forms
-
-
-
- );
-}
diff --git a/packages/design/src/config/edit/InputPatternEdit.tsx b/packages/design/src/config/edit/InputPatternEdit.tsx
index 111f9abe..a1688de8 100644
--- a/packages/design/src/config/edit/InputPatternEdit.tsx
+++ b/packages/design/src/config/edit/InputPatternEdit.tsx
@@ -3,12 +3,13 @@ import { useFormContext } from 'react-hook-form';
import { type InputPattern } from '@atj/forms/src/patterns/input';
import { PatternEditComponent } from '../../FormManager/FormEdit/types';
+import { PatternEditActions } from '../../FormManager/FormEdit/PatternEditActions';
const InputPatternEdit: PatternEditComponent