finos#1073 move DateTimeColumnDescriptor to vuu-table-types package

junaidzm13 · Dec 27, 2023 · 85ee783 · 85ee783
1 parent 768ed50
commit 85ee783
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 14 deletions.
diff --git a/...i/packages/vuu-table-extras/src/column-formatting-settings/DateTimeFormattingSettings.tsx b/...i/packages/vuu-table-extras/src/column-formatting-settings/DateTimeFormattingSettings.tsx
@@ -1,16 +1,19 @@
 import React, { useCallback } from "react";
-import { FormattingSettingsProps } from "./types";
 import { Dropdown, SingleSelectionHandler } from "@finos/vuu-ui-controls";
 import {
-  DateTimeColumnDescriptor,
   DateTimePattern,
   defaultDateTimePatterns,
   getTypeFormattingFromColumn,
   isTypeDescriptor,
   supportedDateTimePatterns,
 } from "@finos/vuu-utils";
 import { FormField, FormFieldLabel } from "@salt-ds/core";
-import { DateTimeColumnTypeSimple } from "packages/vuu-table-types";
+import {
+  DateTimeColumnDescriptor,
+  DateTimeColumnTypeSimple,
+} from "@finos/vuu-table-types";
+
+import { FormattingSettingsProps } from "./types";
 
 export const DateTimeFormattingSettings: React.FC<
   FormattingSettingsProps<DateTimeColumnDescriptor>

diff --git a/vuu-ui/packages/vuu-table-types/index.d.ts b/vuu-ui/packages/vuu-table-types/index.d.ts
@@ -130,6 +130,18 @@ export interface ValueListRenderer {
 }
 
 export declare type DateTimeColumnTypeSimple = "date" | "time";
+
+type DateTimeColumnType =
+  | DateTimeColumnTypeSimple
+  | (Omit<ColumnTypeDescriptor, "name"> & { name: DateTimeColumnTypeSimple });
+
+export declare type DateTimeColumnDescriptor = Omit<
+  ColumnDescriptor,
+  "type"
+> & {
+  type: DateTimeColumnType;
+};
+
 export declare type ColumnTypeSimple =
   | "string"
   | "number"

diff --git a/vuu-ui/packages/vuu-utils/src/column-utils.ts b/vuu-ui/packages/vuu-utils/src/column-utils.ts
@@ -22,7 +22,6 @@ import type {
   ColumnTypeFormatting,
   ColumnTypeRendering,
   ColumnTypeWithValidationRules,
-  DateTimeColumnTypeSimple,
   DefaultColumnConfiguration,
   GroupColumnDescriptor,
   LookupRenderer,
@@ -32,6 +31,7 @@ import type {
   TableHeading,
   TableHeadings,
   ValueListRenderer,
+  DateTimeColumnDescriptor,
 } from "@finos/vuu-table-types";
 import type { CSSProperties } from "react";
 import { moveItem } from "./array-utils";
@@ -131,14 +131,6 @@ export const isNumericColumn = ({ serverDataType, type }: ColumnDescriptor) => {
   return false;
 };
 
-type DateTimeColumnType =
-  | DateTimeColumnTypeSimple
-  | (Omit<ColumnTypeDescriptor, "name"> & { name: DateTimeColumnTypeSimple });
-
-export type DateTimeColumnDescriptor = Omit<ColumnDescriptor, "type"> & {
-  type: DateTimeColumnType;
-};
-
 export const isDateColumn = ({ type }: ColumnDescriptor) =>
   (isTypeDescriptor(type) ? type.name : type) === "date";
 export const isTimeColumn = ({ type }: ColumnDescriptor) =>

diff --git a/vuu-ui/packages/vuu-utils/src/date/helpers.ts b/vuu-ui/packages/vuu-utils/src/date/helpers.ts
@@ -1,5 +1,8 @@
-import { DateTimeColumnTypeSimple } from "@finos/vuu-table-types";
-import { DateTimeColumnDescriptor, isTypeDescriptor } from "../column-utils";
+import {
+  DateTimeColumnTypeSimple,
+  DateTimeColumnDescriptor,
+} from "@finos/vuu-table-types";
+import { isTypeDescriptor } from "../column-utils";
 import { DateTimePattern, isDateTimePattern } from "./types";
 
 export const defaultDateTimePatterns: Record<