first draft moving all components to ts

VulcanJS · Feb 28, 2022 · 30d2a90 · 30d2a90
1 parent d87c956
commit 30d2a90
Show file tree

Hide file tree

Showing 10 changed files with 312 additions and 236 deletions.
diff --git a/packages/i18n/intl.ts b/packages/i18n/intl.ts
@@ -374,13 +374,16 @@ export const getIntlLabel = (
   {
     intl,
     fieldName,
+    modelName,
     collectionName,
     schema,
     isDescription,
   }: {
     intl?: any;
     fieldName: string;
     schema: VulcanSchema;
+    modelName?: string;
+    /** @deprecated use modelName instead */
     collectionName?: string;
     isDescription?: boolean;
   },
@@ -403,8 +406,14 @@ export const getIntlLabel = (
   if (intlId) {
     intlKeys.push(intlId);
   }
-  if (collectionName) {
-    intlKeys.push(`${collectionName.toLowerCase()}.${fieldName}`);
+  if (collectionName || modelName) {
+    intlKeys.push(
+      `${(
+        collectionName ||
+        modelName ||
+        "unknown-model-name"
+      ).toLowerCase()}.${fieldName}`
+    );
   }
   intlKeys.push(`global.${fieldName}`);
   intlKeys.push(fieldName);
@@ -432,6 +441,8 @@ export const formatLabel = (
     intl?: any;
     fieldName: string;
     schema: VulcanSchema;
+    modelName?: string;
+    /** @deprecated use modelName instead */
     collectionName?: string;
   },
   values?: any

diff --git a/packages/react-ui/components/Datatable/DatatableContents.tsx b/packages/react-ui/components/Datatable/DatatableContents.tsx
@@ -110,7 +110,6 @@ export const DatatableContents = (props: DatatableContentsProps) => {
           {showSelect && <th />}
           {sortedColumns.map((column, index) => (
             <Components.DatatableHeader
-              Components={Components}
               key={index}
               model={model}
               column={column}