diff --git a/app/src/media/AppMedia.ts b/app/src/media/AppMedia.ts index 564b008..779d02a 100644 --- a/app/src/media/AppMedia.ts +++ b/app/src/media/AppMedia.ts @@ -124,7 +124,8 @@ export class AppMedia extends Module { async (e) => { const mutator = em.mutator(media); mutator.__unstable_toggleSystemEntityCreation(false); - await mutator.insertOne(this.uploadedEventDataToMediaPayload(e.params)); + const payload = this.uploadedEventDataToMediaPayload(e.params); + await mutator.insertOne(payload); mutator.__unstable_toggleSystemEntityCreation(true); console.log("App:storage:file uploaded", e); }, diff --git a/app/src/media/api/MediaController.ts b/app/src/media/api/MediaController.ts index 7622c9c..fc70cce 100644 --- a/app/src/media/api/MediaController.ts +++ b/app/src/media/api/MediaController.ts @@ -89,7 +89,8 @@ export class MediaController extends Controller { ); } - return c.json(await this.getStorage().uploadFile(body, filename), HttpStatus.CREATED); + const res = await this.getStorage().uploadFile(body, filename); + return c.json(res, HttpStatus.CREATED); }); // add upload file to entity diff --git a/app/src/media/storage/Storage.ts b/app/src/media/storage/Storage.ts index 51f6ae5..1a17c7b 100644 --- a/app/src/media/storage/Storage.ts +++ b/app/src/media/storage/Storage.ts @@ -80,7 +80,6 @@ export class Storage implements EmitsEvents { noEmit?: boolean ): Promise { const result = await this.#adapter.putObject(name, file); - console.log("result", result); let info: FileUploadPayload; diff --git a/app/src/media/storage/adapters/StorageS3Adapter.ts b/app/src/media/storage/adapters/StorageS3Adapter.ts index 4e9ac94..cd051d7 100644 --- a/app/src/media/storage/adapters/StorageS3Adapter.ts +++ b/app/src/media/storage/adapters/StorageS3Adapter.ts @@ -122,18 +122,7 @@ export class StorageS3Adapter extends AwsClient implements StorageAdapter { if (res.ok) { // "df20fcb574dba1446cf5ec997940492b" - const etag = String(res.headers.get("etag")); - if (isFile(body)) { - return { - etag, - name: body.name, - meta: { - size: body.size, - type: body.type - } - }; - } - return etag; + return String(res.headers.get("etag")); } return undefined; diff --git a/app/src/ui/components/form/json-schema-form/Form.tsx b/app/src/ui/components/form/json-schema-form/Form.tsx index c26cb01..0cc5e97 100644 --- a/app/src/ui/components/form/json-schema-form/Form.tsx +++ b/app/src/ui/components/form/json-schema-form/Form.tsx @@ -225,12 +225,12 @@ export function FormContextOverride({ // especially useful for AnyOf, since it doesn't need to fully validate (e.g. pattern) if (prefix) { additional.root = prefix; - additional.setValue = (pointer: string, value: any) => { - ctx.setValue(prefixPointer(pointer, prefix), value); - }; - additional.deleteValue = (pointer: string) => { - ctx.deleteValue(prefixPointer(pointer, prefix)); + /*additional.setValue = (path: string, value: any) => { + ctx.setValue(prefixPath(path, prefix), value); }; + additional.deleteValue = (path: string) => { + ctx.deleteValue(prefixPath(path, prefix)); + };*/ } const context = { diff --git a/app/src/ui/routes/test/tests/json-schema-form3.tsx b/app/src/ui/routes/test/tests/json-schema-form3.tsx index 0640872..eb0dc65 100644 --- a/app/src/ui/routes/test/tests/json-schema-form3.tsx +++ b/app/src/ui/routes/test/tests/json-schema-form3.tsx @@ -46,7 +46,7 @@ export default function JsonSchemaForm3() { return (
-
console.log("change", data)} onSubmit={(data) => console.log("submit", data)} schema={{ @@ -68,7 +68,7 @@ export default function JsonSchemaForm3() { className="flex flex-col gap-3" validateOn="change" options={{ debug: true }} - /> + />*/} {/**/} {/**/} - {/**/} + options={{ debug: true }} + /*validateOn="change"*/ + /> {/*