$repo
+ *
+ * @return T
+ */
+ public static function findStrictByRepo(EntityRepository $repo, string $id): object
+ {
+ $object = $repo->find($id);
+
+ return $object ?? throw new \InvalidArgumentException(sprintf('%s %s not found', $repo->getClassName(), $id));
+ }
+}
diff --git a/databox/api/tests/Api/CrudTest.php b/databox/api/tests/Api/CrudTest.php
index 2a34f592a..21635c85a 100644
--- a/databox/api/tests/Api/CrudTest.php
+++ b/databox/api/tests/Api/CrudTest.php
@@ -129,7 +129,7 @@ public function getCases(): array
['POST', '/attribute-classes', KeycloakClientTestMock::USER_UID, [
'workspace' => '/workspaces/{workspaceId}',
], [
- 'code' => 422,
+ 'code' => 403,
]],
['POST', '/attribute-classes', KeycloakClientTestMock::ADMIN_UID, [
@@ -163,7 +163,6 @@ public function getCases(): array
]],
['POST', '/rendition-classes', KeycloakClientTestMock::USER_UID, [
- 'workspace' => '/workspaces/{workspaceId}',
], [
'code' => 422,
]],
@@ -196,10 +195,15 @@ public function getCases(): array
'code' => 401,
]],
+ ['POST', '/attribute-definitions', KeycloakClientTestMock::USER_UID, [
+ ], [
+ 'code' => 400,
+ ]],
+
['POST', '/attribute-definitions', KeycloakClientTestMock::USER_UID, [
'workspace' => '/workspaces/{workspaceId}',
], [
- 'code' => 422,
+ 'code' => 403,
]],
['POST', '/attribute-definitions', KeycloakClientTestMock::ADMIN_UID, [
diff --git a/databox/api/tests/Api/RenditionDefinitionTest.php b/databox/api/tests/Api/RenditionDefinitionTest.php
new file mode 100644
index 000000000..c51b9cd7d
--- /dev/null
+++ b/databox/api/tests/Api/RenditionDefinitionTest.php
@@ -0,0 +1,63 @@
+findIriBy(RenditionDefinition::class, ['name' => 'preview']);
+
+ $client->request('PUT', $iri, [
+ 'headers' => [
+ 'Authorization' => 'Bearer '.KeycloakClientTestMock::getJwtFor(KeycloakClientTestMock::ADMIN_UID),
+ ],
+ 'json' => [
+ 'useAsThumbnail' => true,
+ ],
+ ]);
+
+ $this->assertResponseIsSuccessful();
+ $this->assertJsonContains([
+ '@id' => $iri,
+ 'useAsThumbnail' => true,
+ ]);
+ }
+
+ public function testGetRenditionDefinition(): void
+ {
+ self::enableFixtures();
+ $client = static::createClient();
+ $iri = $this->findIriBy(RenditionDefinition::class, ['name' => 'preview']);
+
+ $response = $client->request('GET', $iri, [
+ 'headers' => [
+ 'Authorization' => 'Bearer '.KeycloakClientTestMock::getJwtFor(KeycloakClientTestMock::USER_UID),
+ ],
+ ]);
+ $this->assertResponseIsSuccessful();
+ $this->assertJsonContains([
+ '@id' => $iri,
+ ]);
+ $this->assertArrayNotHasKey('useAsThumbnail', $response->toArray());
+
+ $client->request('GET', $iri, [
+ 'headers' => [
+ 'Authorization' => 'Bearer '.KeycloakClientTestMock::getJwtFor(KeycloakClientTestMock::ADMIN_UID),
+ ],
+ ]);
+ $this->assertResponseIsSuccessful();
+ $this->assertJsonContains([
+ '@id' => $iri,
+ 'useAsThumbnail' => false,
+ ]);
+ }
+}
diff --git a/databox/client/.dockerignore b/databox/client/.dockerignore
index 1d4c4aaab..727aa0d10 100644
--- a/databox/client/.dockerignore
+++ b/databox/client/.dockerignore
@@ -2,11 +2,6 @@
Dockerfile
/README.md
.dockerignore
-/public/env-config.*.js
-/public/index.html
-/npm-debug.log*
-/yarn-debug.log*
-/yarn-error.log*
+/index.html
/i18n-scan-tmp
.idea
-
diff --git a/databox/client/.gitignore b/databox/client/.gitignore
index bda9eb24c..3c3a6868d 100644
--- a/databox/client/.gitignore
+++ b/databox/client/.gitignore
@@ -20,10 +20,5 @@
.env.test.local
.env.production.local
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-/env-config.*.js
/index.html
/i18n-scan-tmp
diff --git a/databox/client/Dockerfile b/databox/client/Dockerfile
index 32fbc17fe..37a94427b 100644
--- a/databox/client/Dockerfile
+++ b/databox/client/Dockerfile
@@ -10,13 +10,9 @@ USER node
WORKDIR /srv/workspace/databox/client
-ENV NODE_ENV=development
-
RUN pnpm install \
&& mv index.tpl.html index.html
-RUN ls -la .
-
RUN pnpm build
############
@@ -37,6 +33,9 @@ RUN apk add --no-cache libstdc++ \
EXPOSE 80
+ARG SENTRY_RELEASE
+ENV SENTRY_RELEASE=${SENTRY_RELEASE}
+
COPY ./databox/client/config-compiler.js /var/app/
WORKDIR /var/app
diff --git a/databox/client/config-compiler.js b/databox/client/config-compiler.js
index 101519556..50ea74c68 100644
--- a/databox/client/config-compiler.js
+++ b/databox/client/config-compiler.js
@@ -1,49 +1,13 @@
(function (config, env) {
config = config || {};
- let scriptTpl = '';
- const analytics = config.databox.analytics;
+ const analytics = {};
- if (analytics) {
- switch (analytics.provider) {
- case 'matomo':
- scriptTpl = `
-
-
-`
- .replace('{host}', analytics.options.host)
- .replace('{siteId}', analytics.options.siteId);
- break;
- case 'google_analytics':
- scriptTpl =
- `
-
-
-`.replace(/{propertyId}/g, analytics.options.propertyId);
- break;
- default:
- console.error(
- `Unsupported analytics provider ${analytics.provider}`
- );
- }
+ if (env.MATOMO_URL) {
+ analytics.matomo = {
+ baseUrl: env.MATOMO_URL,
+ siteId: env.MATOMO_SITE_ID,
+ };
}
const normalizeTypes = value => {
@@ -56,7 +20,7 @@
return {};
}
- const types = [...v.matchAll(/([\w*]+\/[\w*+.-]+)(\([\w,]*\))?/g)];
+ const types = [...v.matchAll(/([\w*]+\/[\w*+.-]+)(\([.\w,]*\))?/g)];
const struct = {};
for (const t of types) {
struct[t[1]] = t[2]
@@ -71,10 +35,21 @@
return struct;
};
+ function castBoolean(value) {
+ if (typeof value === 'boolean') {
+ return value;
+ }
+
+ if (typeof value === 'string') {
+ return ['true', '1', 'on', 'y', 'yes'].includes(
+ value.toLowerCase()
+ );
+ }
+
+ return false;
+ }
+
return {
- customHTML: {
- __TPL_HEAD__: scriptTpl,
- },
locales: config.available_locales,
autoConnectIdP: env.AUTO_CONNECT_IDP,
baseUrl: env.DATABOX_API_URL,
@@ -83,10 +58,15 @@
keycloakUrl: env.KEYCLOAK_URL,
realmName: env.KEYCLOAK_REALM_NAME,
clientId: env.CLIENT_ID,
- devMode: env.DEV_MODE === 'true',
+ devMode: castBoolean(env.DEV_MODE),
requestSignatureTtl: env.S3_REQUEST_SIGNATURE_TTL,
- displayServicesMenu: env.DISPLAY_SERVICES_MENU === 'true',
+ displayServicesMenu: castBoolean(env.DISPLAY_SERVICES_MENU),
dashboardBaseUrl: env.DASHBOARD_URL,
allowedTypes: normalizeTypes(env.ALLOWED_FILE_TYPES),
+ analytics,
+ appId: env.APP_ID || 'databox',
+ sentryDsn: env.SENTRY_DSN,
+ sentryEnvironment: env.SENTRY_ENVIRONMENT,
+ sentryRelease: env.SENTRY_RELEASE,
};
});
diff --git a/databox/client/index.tpl.html b/databox/client/index.tpl.html
index 84884b7b5..a53b855aa 100644
--- a/databox/client/index.tpl.html
+++ b/databox/client/index.tpl.html
@@ -26,7 +26,6 @@
-->
Databox.
__TPL_CONFIG__
- __TPL_HEAD__
diff --git a/databox/client/manifest.json b/databox/client/manifest.json
index 080d6c77a..478bf8e25 100644
--- a/databox/client/manifest.json
+++ b/databox/client/manifest.json
@@ -18,7 +18,7 @@
"sizes": "512x512"
}
],
- "start_url": ".",
+ "start_url": "/",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
diff --git a/databox/client/package.json b/databox/client/package.json
index 193b1e37c..042e2e49e 100644
--- a/databox/client/package.json
+++ b/databox/client/package.json
@@ -5,19 +5,21 @@
"dependencies": {
"@alchemy/api": "workspace:*",
"@alchemy/auth": "workspace:*",
+ "@alchemy/core": "workspace:*",
"@alchemy/react-auth": "workspace:*",
"@alchemy/react-ps": "workspace:*",
+ "@alchemy/theme-editor": "workspace:*",
"@alchemy/visual-workflow": "workspace:*",
"@alchemy/react-hooks": "workspace:*",
"@alchemy/navigation": "workspace:*",
"@dnd-kit/core": "^6.0.5",
"@dnd-kit/sortable": "^7.0.1",
"@dnd-kit/utilities": "^3.2.0",
- "@emotion/react": "^11.9.0",
- "@emotion/styled": "^11.8.1",
- "@mui/icons-material": "^5.6.2",
- "@mui/lab": "^5.0.0-alpha.80",
- "@mui/material": "^5.10.13",
+ "@emotion/react": "^11.11.1",
+ "@emotion/styled": "^11.11.0",
+ "@mui/icons-material": "^5.15.0",
+ "@mui/lab": "^5.0.0-alpha.156",
+ "@mui/material": "^5.15.0",
"@toast-ui/react-image-editor": "^3.15.2",
"ace-builds": "^1.14.0",
"axios": "^1.6.2",
@@ -38,7 +40,7 @@
"react-compare-image": "^3.1.0",
"react-dnd": "^16.0.1",
"react-dnd-html5-backend": "^16.0.1",
- "react-dom": "^18.1.0",
+ "react-dom": "^18.2.0",
"react-dropzone": "^14.2.1",
"react-hook-form": "^7.48.2",
"react-i18next": "^13.5.0",
@@ -46,10 +48,9 @@
"react-nl2br": "^1.0.3",
"react-pdf": "^7.5.1",
"react-player": "^2.10.1",
- "react-scripts": "^5.0.1",
"react-select": "^5.3.2",
"react-string-replace": "^1.1.0",
- "react-toastify": "^9.0.1",
+ "react-toastify": "^9.1.3",
"sass": "^1.60.0",
"tui-image-editor": "^3.15.3",
"uuid": "^9.0.0",
diff --git a/databox/client/src/components/App.tsx b/databox/client/src/components/App.tsx
index 8d6625c6e..008824faa 100644
--- a/databox/client/src/components/App.tsx
+++ b/databox/client/src/components/App.tsx
@@ -83,7 +83,9 @@ const AppProxy = React.memo(() => {
export default function App() {
const {logout} = useAuth();
const onError = useRequestErrorHandler({
- logout,
+ logout: (redirectPathAfterLogin) => {
+ logout(redirectPathAfterLogin, true);
+ },
});
React.useEffect(() => {
diff --git a/databox/client/src/components/Dialog/Collection/EditCollection.tsx b/databox/client/src/components/Dialog/Collection/EditCollection.tsx
index b1bc14d65..535c965bb 100644
--- a/databox/client/src/components/Dialog/Collection/EditCollection.tsx
+++ b/databox/client/src/components/Dialog/Collection/EditCollection.tsx
@@ -6,6 +6,7 @@ import {useFormSubmit} from '@alchemy/api';
import FormTab from '../Tabbed/FormTab';
import {DialogTabProps} from '../Tabbed/TabbedDialog';
import {CollectionForm} from '../../Form/CollectionForm';
+import {useInRouterDirtyFormPrompt} from '@alchemy/navigation';
export type OnCollectionEdit = (coll: Collection) => void;
@@ -36,7 +37,12 @@ export default function EditCollection({data, onClose, minHeight}: Props) {
},
});
- const {submitting, remoteErrors} = usedFormSubmit;
+ const {
+ submitting,
+ remoteErrors,
+ forbidNavigation,
+ } = usedFormSubmit;
+ useInRouterDirtyFormPrompt(t, forbidNavigation);
const formId = 'edit-collection';
diff --git a/databox/client/src/components/Dialog/Tabbed/FormTab.tsx b/databox/client/src/components/Dialog/Tabbed/FormTab.tsx
index 7095ff724..e5f176ff7 100644
--- a/databox/client/src/components/Dialog/Tabbed/FormTab.tsx
+++ b/databox/client/src/components/Dialog/Tabbed/FormTab.tsx
@@ -6,7 +6,7 @@ import {LoadingButton} from '@mui/lab';
import SaveIcon from '@mui/icons-material/Save';
import RemoteErrors from '../../Form/RemoteErrors';
import {useTranslation} from 'react-i18next';
-import {useInRouterDirtyFormPrompt} from '@alchemy/navigation';
+import {useInRouterDirtyFormPrompt, useOutsideRouterDirtyFormPrompt} from '@alchemy/navigation';
type Props = PropsWithChildren<{
loading: boolean;
@@ -25,6 +25,12 @@ export function useDirtyFormPrompt(isDirty: boolean) {
useInRouterDirtyFormPrompt(t, isDirty);
}
+export function useDirtyFormPromptOutsideRouter(isDirty: boolean) {
+ const {t} = useTranslation();
+
+ useOutsideRouterDirtyFormPrompt(t, isDirty);
+}
+
export default function FormTab({
formId,
onSave,
diff --git a/databox/client/src/components/Dialog/Tabbed/TabbedDialog.tsx b/databox/client/src/components/Dialog/Tabbed/TabbedDialog.tsx
index ca547c313..c0ae39191 100644
--- a/databox/client/src/components/Dialog/Tabbed/TabbedDialog.tsx
+++ b/databox/client/src/components/Dialog/Tabbed/TabbedDialog.tsx
@@ -42,7 +42,7 @@ export default function TabbedDialog({
const closeModal = useCloseModal();
const tabs = configTabs.filter(t => t.enabled);
const tabIndex = tabs.findIndex(t => t.id === tab);
- const currentTab = tabs[tabIndex];
+ const currentTab = tabIndex >= 0 ? tabs[tabIndex] : undefined;
const handleChange = (_event: React.SyntheticEvent, newValue: number) => {
navigateToModal(route, {
@@ -51,6 +51,12 @@ export default function TabbedDialog
({
});
};
+ React.useEffect(() => {
+ if (!currentTab) {
+ closeModal();
+ }
+ }, [currentTab, closeModal]);
+
return (
{({open}) => (
@@ -81,7 +87,7 @@ export default function TabbedDialog({
);
})}
- {React.createElement(currentTab.component, {
+ {currentTab && React.createElement(currentTab.component, {
...rest,
...currentTab.props,
onClose: closeModal,
diff --git a/databox/client/src/components/Dialog/Workspace/AttributeClassManager.tsx b/databox/client/src/components/Dialog/Workspace/AttributeClassManager.tsx
index 38f60c359..a861cc9e4 100644
--- a/databox/client/src/components/Dialog/Workspace/AttributeClassManager.tsx
+++ b/databox/client/src/components/Dialog/Workspace/AttributeClassManager.tsx
@@ -1,4 +1,4 @@
-import React, {useEffect} from 'react';
+import {useEffect} from 'react';
import {AttributeClass, Workspace} from '../../../types';
import {
deleteAttributeClass,
@@ -23,21 +23,14 @@ function Item({
usedFormSubmit: {
submitting,
register,
- handleSubmit,
control,
watch,
setValue,
- reset,
formState: {errors},
},
- formId,
}: DefinitionItemFormProps) {
const {t} = useTranslation();
- React.useEffect(() => {
- reset(data);
- }, [data]);
-
const isPublic = watch('public');
const isEditable = watch('editable');
const displayedPermissions = !isPublic
@@ -45,13 +38,13 @@ function Item({
: [AclPermission.EDIT];
useEffect(() => {
- if (!isPublic) {
+ if (!isPublic && isEditable) {
setValue('editable', false);
}
- }, [isPublic]);
+ }, [isPublic, isEditable]);
return (
-
+
);
}
diff --git a/databox/client/src/components/Dialog/Workspace/AttributeDefinitionManager.tsx b/databox/client/src/components/Dialog/Workspace/AttributeDefinitionManager.tsx
index 2cb67a068..a3d0be068 100644
--- a/databox/client/src/components/Dialog/Workspace/AttributeDefinitionManager.tsx
+++ b/databox/client/src/components/Dialog/Workspace/AttributeDefinitionManager.tsx
@@ -200,7 +200,7 @@ export default function AttributeDefinitionManager({
};
const onSort: OnSort = async ids => {
- await apiClient.put(`/attribute-definitions/sort`, ids);
+ await apiClient.post(`/attribute-definitions/sort`, ids);
toast.success(t('common.item_sorted', 'Order saved!') as string);
};
@@ -217,6 +217,7 @@ export default function AttributeDefinitionManager({
handleSave={handleSave}
handleDelete={deleteAttributeDefinition}
onSort={onSort}
+ normalizeData={createData}
/>
);
}
diff --git a/databox/client/src/components/Dialog/Workspace/DefinitionManager.tsx b/databox/client/src/components/Dialog/Workspace/DefinitionManager.tsx
index 3f24a3d0b..c1b8dfe24 100644
--- a/databox/client/src/components/Dialog/Workspace/DefinitionManager.tsx
+++ b/databox/client/src/components/Dialog/Workspace/DefinitionManager.tsx
@@ -40,7 +40,6 @@ export type DefinitionItemProps = {
};
export type DefinitionItemFormProps = {
- formId: string;
usedFormSubmit: UseFormSubmitReturn;
workspaceId: string;
} & DefinitionItemProps;
@@ -96,6 +95,7 @@ type Props = {
handleDelete?: (id: string) => Promise;
workspaceId: string;
onSort?: OnSort;
+ normalizeData?: (data: D) => D;
};
export default function DefinitionManager({
@@ -186,7 +186,18 @@ export default function DefinitionManager({
},
});
- const {submitting, remoteErrors, forbidNavigation} = usedFormSubmit;
+ const {
+ submitting,
+ remoteErrors,
+ forbidNavigation,
+ reset,
+ } = usedFormSubmit;
+
+ React.useEffect(() => {
+ if (item && 'new' !== item) {
+ reset(item);
+ }
+ }, [item]);
const onDelete = useCallback(() => {
if (handleDelete && typeof item === 'object') {
@@ -344,23 +355,20 @@ export default function DefinitionManager({
}}
>
{item && (
- <>
-
-
+
)}
{item && item !== 'new' && handleDelete && (
diff --git a/databox/client/src/components/Dialog/Workspace/RenditionClassManager.tsx b/databox/client/src/components/Dialog/Workspace/RenditionClassManager.tsx
index f9ba71564..e20ac5aa9 100644
--- a/databox/client/src/components/Dialog/Workspace/RenditionClassManager.tsx
+++ b/databox/client/src/components/Dialog/Workspace/RenditionClassManager.tsx
@@ -6,7 +6,6 @@ import DefinitionManager, {
DefinitionItemProps,
} from './DefinitionManager';
import {useTranslation} from 'react-i18next';
-import {useForm} from 'react-hook-form';
import FormFieldErrors from '../../Form/FormFieldErrors';
import {
deleteRenditionClass,
@@ -16,53 +15,40 @@ import {
} from '../../../api/rendition';
import CheckboxWidget from '../../Form/CheckboxWidget';
import RenditionClassPermissions from './RenditionClassPermissions';
-import {useDirtyFormPrompt} from '../Tabbed/FormTab';
function Item({
data,
- usedFormSubmit,
- formId,
-}: DefinitionItemFormProps) {
- const {t} = useTranslation();
-
- const {
- register,
- handleSubmit,
+ usedFormSubmit: {
submitting,
- watch,
+ register,
control,
+ watch,
formState: {errors},
- forbidNavigation,
- } = usedFormSubmit;
-
- const {} = useForm({
- defaultValues: data,
- });
- useDirtyFormPrompt(forbidNavigation);
+ },
+}: DefinitionItemFormProps) {
+ const {t} = useTranslation();
const isPublic = watch('public');
return (
<>
-
+
+
+
+
+
+
+
+
{data.id && !isPublic && (
diff --git a/databox/client/src/components/Dialog/Workspace/RenditionDefinitionManager.tsx b/databox/client/src/components/Dialog/Workspace/RenditionDefinitionManager.tsx
index daa50c3d2..f51220374 100644
--- a/databox/client/src/components/Dialog/Workspace/RenditionDefinitionManager.tsx
+++ b/databox/client/src/components/Dialog/Workspace/RenditionDefinitionManager.tsx
@@ -18,26 +18,27 @@ import RenditionClassSelect from '../../Form/RenditionClassSelect';
import CheckboxWidget from '../../Form/CheckboxWidget';
import apiClient from '../../../api/api-client';
import {toast} from 'react-toastify';
-import {useDirtyFormPrompt} from '../Tabbed/FormTab';
+import React from "react";
function Item({
- formId,
+ data,
usedFormSubmit: {
+ submitting,
register,
- handleSubmit,
control,
+ reset,
formState: {errors},
- submitting,
- forbidNavigation,
},
workspaceId,
}: DefinitionItemFormProps) {
const {t} = useTranslation();
- useDirtyFormPrompt(forbidNavigation);
+ React.useEffect(() => {
+ reset(data);
+ }, [data]);
return (
-
+
);
}
@@ -172,7 +173,7 @@ export default function RenditionDefinitionManager({
};
const onSort: OnSort = async ids => {
- await apiClient.put(`/rendition-definitions/sort`, ids);
+ await apiClient.post(`/rendition-definitions/sort`, ids);
toast.success(t('common.item_sorted', 'Order saved!') as string);
};
diff --git a/databox/client/src/components/Dialog/Workspace/TagManager.tsx b/databox/client/src/components/Dialog/Workspace/TagManager.tsx
index 8b375943c..b01192fc7 100644
--- a/databox/client/src/components/Dialog/Workspace/TagManager.tsx
+++ b/databox/client/src/components/Dialog/Workspace/TagManager.tsx
@@ -9,26 +9,20 @@ import {useTranslation} from 'react-i18next';
import {Controller} from 'react-hook-form';
import FormFieldErrors from '../../Form/FormFieldErrors';
import {deleteTag, getTags, postTag, putTag} from '../../../api/tag';
-import {useDirtyFormPrompt} from '../Tabbed/FormTab';
import ColorPicker from '../../Form/ColorPicker';
function Item({
usedFormSubmit: {
register,
control,
- handleSubmit,
submitting,
- forbidNavigation,
formState: {errors},
},
- formId,
}: DefinitionItemFormProps) {
const {t} = useTranslation();
- useDirtyFormPrompt(forbidNavigation);
-
return (
-
+
);
}
diff --git a/databox/client/src/components/Dialog/Workspace/WorkspaceDialog.tsx b/databox/client/src/components/Dialog/Workspace/WorkspaceDialog.tsx
index a6bd3ebf8..b7c0661fb 100644
--- a/databox/client/src/components/Dialog/Workspace/WorkspaceDialog.tsx
+++ b/databox/client/src/components/Dialog/Workspace/WorkspaceDialog.tsx
@@ -15,6 +15,9 @@ import RenditionClassManager from './RenditionClassManager';
import RenditionDefinitionManager from './RenditionDefinitionManager';
import InfoWorkspace from './InfoWorkspace';
import {modalRoutes} from '../../../routes.ts';
+import {useForceLogin} from '@alchemy/react-auth';
+import config from "../../../config.ts";
+import {keycloakClient} from "../../../api/api-client.ts";
type Props = {};
@@ -24,6 +27,11 @@ export default function WorkspaceDialog({}: Props) {
const [data, setData] = useState();
+ useForceLogin({
+ keycloakClient,
+ autoConnectIdP: config.autoConnectIdP,
+ });
+
useEffect(() => {
getWorkspace(id!).then(c => setData(c));
}, [id]);
diff --git a/databox/client/src/components/Form/CollectionForm.tsx b/databox/client/src/components/Form/CollectionForm.tsx
index 3ac8e77e3..3adc31ab2 100644
--- a/databox/client/src/components/Form/CollectionForm.tsx
+++ b/databox/client/src/components/Form/CollectionForm.tsx
@@ -6,7 +6,6 @@ import FormFieldErrors from './FormFieldErrors';
import PrivacyField from '../Ui/PrivacyField';
import FormRow from './FormRow';
import {FormProps} from './types';
-import {useDirtyFormPrompt} from '../Dialog/Tabbed/FormTab';
export const CollectionForm: FC> = function ({
formId,
@@ -15,14 +14,11 @@ export const CollectionForm: FC> = function ({
submitting,
register,
control,
- forbidNavigation,
formState: {errors},
},
}) {
const {t} = useTranslation();
- useDirtyFormPrompt(forbidNavigation);
-
return (
-
- 
-
- 
-
- 
-
- 
-
-