Don't use ambient types

anyone-oslo · May 14, 2024 · a18d7f5 · a18d7f5
1 parent c6a7fb6
commit a18d7f5
Show file tree

Hide file tree

Showing 74 changed files with 681 additions and 543 deletions.
diff --git a/app/assets/builds/pages_core/admin-dist.js b/app/assets/builds/pages_core/admin-dist.js
diff --git a/app/assets/builds/pages_core/admin-dist.js.map b/app/assets/builds/pages_core/admin-dist.js.map
diff --git a/app/javascript/@types/Attachments.d.ts b/app/javascript/@types/Attachments.d.ts
diff --git a/app/javascript/@types/Crop.d.ts b/app/javascript/@types/Crop.d.ts
diff --git a/app/javascript/@types/Drag.d.ts b/app/javascript/@types/Drag.d.ts
diff --git a/app/javascript/@types/ImageGrid.d.ts b/app/javascript/@types/ImageGrid.d.ts
diff --git a/app/javascript/@types/Page.d.ts b/app/javascript/@types/Page.d.ts
diff --git a/app/javascript/@types/PageForm.d.ts b/app/javascript/@types/PageForm.d.ts
diff --git a/app/javascript/@types/TagEditor.d.ts b/app/javascript/@types/TagEditor.d.ts
diff --git a/app/javascript/@types/Template.d.ts b/app/javascript/@types/Template.d.ts
diff --git a/app/javascript/@types/Tree.d.ts b/app/javascript/@types/Tree.d.ts
diff --git a/app/javascript/@types/index.d.ts b/app/javascript/@types/index.d.ts
diff --git a/app/javascript/components/Attachments.tsx b/app/javascript/components/Attachments.tsx
@@ -1,9 +1,10 @@
 import React from "react";
 import useAttachments from "./Attachments/useAttachments";
 import List from "./Attachments/List";
+import * as Attachment from "../types/Attachments";
 
-interface Props extends Attachments.Options {
-  records: AttachmentRecord[];
+interface Props extends Attachment.Options {
+  records: Attachment.Record[];
 }
 
 export default function Attachments(props: Props) {

diff --git a/app/javascript/components/Attachments/Attachment.tsx b/app/javascript/components/Attachments/Attachment.tsx
@@ -3,22 +3,25 @@ import copyToClipboard from "../../lib/copyToClipboard";
 import AttachmentEditor from "./AttachmentEditor";
 import useModalStore from "../../stores/useModalStore";
 import useToastStore from "../../stores/useToastStore";
+import * as Attachments from "../../types/Attachments";
+import * as Drag from "../../types/Drag";
+import { Locale } from "../../types";
 
 import { useDraggable } from "../drag";
 
 interface Props {
   attributeName: string;
   placeholder: boolean;
-  draggable: Drag.Draggable<AttachmentRecord>;
+  draggable: Drag.Draggable<Attachments.Record>;
   locale: string;
   locales: { [index: string]: Locale };
   deleteRecord: () => void;
   showEmbed: boolean;
   position: number;
-  onUpdate: (attachment: Partial<AttachmentResource>) => void;
+  onUpdate: (attachment: Partial<Attachments.Resource>) => void;
   startDrag: (
     evt: MouseEvent,
-    draggable: Drag.Draggable<AttachmentRecord>
+    draggable: Drag.Draggable<Attachments.Record>
   ) => void;
 }
 
@@ -30,7 +33,10 @@ export default function Attachment(props: Props) {
   const openModal = useModalStore((state) => state.open);
   const notice = useToastStore((state) => state.notice);
 
-  const listeners = useDraggable<AttachmentRecord>(draggable, props.startDrag);
+  const listeners = useDraggable<Attachments.Record>(
+    draggable,
+    props.startDrag
+  );
 
   const copyEmbed = (evt: MouseEvent) => {
     evt.preventDefault();

diff --git a/app/javascript/components/Attachments/AttachmentEditor.tsx b/app/javascript/components/Attachments/AttachmentEditor.tsx
@@ -3,12 +3,14 @@ import copyToClipboard, { copySupported } from "../../lib/copyToClipboard";
 import useModalStore from "../../stores/useModalStore";
 import useToastStore from "../../stores/useToastStore";
 import { putJson } from "../../lib/request";
+import * as Attachments from "../../types/Attachments";
+import { Locale } from "../../types";
 
 interface Props {
-  attachment: AttachmentResource;
+  attachment: Attachments.Resource;
   locale: string;
   locales: { [index: string]: Locale };
-  onUpdate: (attachment: Partial<AttachmentResource>) => void;
+  onUpdate: (attachment: Partial<Attachments.Resource>) => void;
 }
 
 export default function AttachmentEditor(props: Props) {