add messages to update errors in console, fixup missed error in Date …

…type
aspen-cloud · Jun 24, 2024 · 907c1d9 · 907c1d9
1 parent aac43bb
commit 907c1d9
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 20 deletions.
diff --git a/packages/console/src/components/data-table.tsx b/packages/console/src/components/data-table.tsx
@@ -43,6 +43,7 @@ import {
  updateTriplitSet,
  updateTriplitValue,
 } from 'src/utils/mutate-cells.js';
+import { useToast } from 'src/hooks/useToast.js';
 
 interface DataTableProps<TData, TValue> {
  columns: ColumnDef<TData, TValue>[];
@@ -230,6 +231,7 @@ export function DataCell({
  editable = true,
  optional = false,
 }: TriplitDataCellProps) {
+ const { toast } = useToast();
  const [isEditing, setIsEditing] = useState(false);
  const nullable = !!attributeDef?.options?.nullable;
  useEffect(() => {
@@ -261,29 +263,45 @@ export function DataCell({
  <SetCellEditor
  set={value}
  definition={attributeDef}
- onChangeSet={(value, action) => {
- updateTriplitSet(
+ onChangeSet={async (value, action) => {
+ const error = await updateTriplitSet(
  attribute,
  client,
  collection,
  entityId,
  value,
  action
  );
+ if (error) {
+ toast({
+ title: 'Error',
+ description: error,
+ variant: 'destructive',
+ });
+ return;
+ }
  }}
  />
  ) : attributeDef?.type === 'record' ? (
  <RecordCellEditor
  value={value}
  definition={attributeDef}
- onSubmit={(newValue) => {
- updateTriplitValue(
+ onSubmit={async (newValue) => {
+ const error = await updateTriplitValue(
  attribute,
  client,
  collection,
  entityId,
  newValue
  );
+ if (error) {
+ toast({
+ title: 'Error',
+ description: error,
+ variant: 'destructive',
+ });
+ return;
+ }
  setIsEditing(false);
  }}
  onBlur={() => setIsEditing(false)}
@@ -293,15 +311,24 @@ export function DataCell({
  value={value}
  definition={attributeDef as ValueAttributeDefinition}
  onBlur={() => setIsEditing(false)}
- onSubmit={(newValue: TriplitDataTypes) => {
- if (newValue !== value)
- updateTriplitValue(
+ onSubmit={async (newValue: TriplitDataTypes) => {
+ if (newValue !== value) {
+ const error = await updateTriplitValue(
  attribute,
  client,
  collection,
  entityId,
  newValue
  );
+ if (error) {
+ toast({
+ title: 'Error',
+ description: error,
+ variant: 'destructive',
+ });
+ return;
+ }
+ }
  setIsEditing(false);
  }}
  />
@@ -313,14 +340,22 @@ export function DataCell({
  className="text-xs h-auto py-1 px-2 justify-self-start"
  variant={'ghost'}
  disabled={value === null}
- onClick={(e) => {
- updateTriplitValue(
+ onClick={async (e) => {
+ const error = await updateTriplitValue(
  attribute,
  client,
  collection,
  entityId,
  null
  );
+ if (error) {
+ toast({
+ title: 'Error',
+ description: error,
+ variant: 'destructive',
+ });
+ return;
+ }
  }}
  >
  Set to <Code className="text-xs ml-1">null</Code>
@@ -331,8 +366,21 @@ export function DataCell({
  className="text-xs h-auto py-1 px-2 justify-self-start"
  disabled={value === undefined}
  variant={'ghost'}
- onClick={(e) => {
- deleteTriplitValue(attribute, client, collection, entityId);
+ onClick={async (e) => {
+ const error = await deleteTriplitValue(
+ attribute,
+ client,
+ collection,
+ entityId
+ );
+ if (error) {
+ toast({
+ title: 'Error',
+ description: error,
+ variant: 'destructive',
+ });
+ return;
+ }
  }}
  >
  Delete{' '}

diff --git a/packages/console/src/utils/mutate-cells.ts b/packages/console/src/utils/mutate-cells.ts
@@ -1,4 +1,5 @@
 import { TriplitClient } from '@triplit/client';
+import { TriplitError } from '@triplit/db';
 
 export type TriplitDataTypes =
  | string
@@ -26,7 +27,12 @@ export async function updateTriplitValue(
  entityCopy[path[0]] = value;
  });
  } catch (e) {
- console.error(e);
+ if (e instanceof TriplitError) {
+ return e.message;
+ } else {
+ console.error(e);
+ return `An unknown error occurred updating entity '${entityId}'.`;
+ }
  }
 }
 
@@ -47,7 +53,12 @@ export async function deleteTriplitValue(
  delete entityCopy[path[0]];
  });
  } catch (e) {
- console.error(e);
+ if (e instanceof TriplitError) {
+ return e.message;
+ } else {
+ console.error(e);
+ return `An unknown error occurred deleting entity '${entityId}'.`;
+ }
  }
 }
 
@@ -92,6 +103,11 @@ export async function updateTriplitSet(
  }
  });
  } catch (e) {
- console.error(e);
+ if (e instanceof TriplitError) {
+ return e.message;
+ } else {
+ console.error(e);
+ return `An unknown error occurred updating entity '${entityId}'.`;
+ }
  }
 }
diff --git a/packages/db/src/data-types/date.ts b/packages/db/src/data-types/date.ts
@@ -64,12 +64,11 @@ export function DateType<TypeOptions extends UserTypeOptions = {}>(
  return new Date(dateString);
  },
  validateInput(val: any) {
- if (
- val instanceof Date ||
- !Number.isNaN(Date.parse(val)) ||
- (options.nullable && val === null)
- )
- return;
+ const isValidDate = val instanceof Date && !Number.isNaN(val.getTime());
+ const isValidDateString =
+ typeof val === 'string' && !Number.isNaN(Date.parse(val));
+ const isNullAndValid = options.nullable && val === null;
+ if (isValidDate || isValidDateString || isNullAndValid) return;
  return valueMismatchMessage('date', options, val);
  },
  validateTripleValue(val: any) {