@equinor/apollo-utils 0.1.2 → 0.1.3-beta.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @equinor/apollo-utils
 
+## 0.1.3
+
+### Patch Changes
+
+- e1354f0: Move edit cells to apollo-utils
+- Updated dependencies [e1354f0]
+  - @equinor/apollo-components@3.1.2
+
 ## 0.1.2
 
 ### Patch Changes

package/package.json

@@ -2,7 +2,7 @@
   "name": "@equinor/apollo-utils",
   "main": "src/index.ts",
   "types": "src/index.ts",
-  "version": "0.1.2",
+  "version": "0.1.3-beta.0",
   "license": "MIT",
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts --external react",
@@ -17,7 +17,6 @@
     "access": "public"
   },
   "dependencies": {
-    "apollo-common": "*",
     "jotai": "^2.0.1",
     "tsup": "^6.6.3",
     "typescript": "^4.9.5",
@@ -26,9 +25,11 @@
   "peerDependencies": {
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-hook-form": "^7.43.8"
+    "react-hook-form": "^7.43.8",
+    "@equinor/apollo-components": "^3.1.0"
   },
   "devDependencies": {
+    "@equinor/apollo-components": "*",
     "@testing-library/react": "^13.4.0",
     "@testing-library/react-hooks": "^8.0.1",
     "@vitest/ui": "^0.28.5",

package/src/edit-cells/EditableDateCell.tsx

@@ -1,6 +1,6 @@
+import { TypographyCustom } from '@equinor/apollo-components'
 import { TextField } from '@equinor/eds-core-react'
 import { CellContext } from '@tanstack/react-table'
-import { TypographyCustom } from 'apollo-common'
 import { ChangeEvent, useMemo } from 'react'
 import { Controller, useFormContext } from 'react-hook-form'
 import styled from 'styled-components'

package/src/edit-cells/EditableDropdownCell.tsx

@@ -1,6 +1,6 @@
+import { TypographyCustom } from '@equinor/apollo-components'
 import { Autocomplete } from '@equinor/eds-core-react'
 import { CellContext } from '@tanstack/react-table'
-import { TypographyCustom } from 'apollo-common'
 import { Controller, useFormContext } from 'react-hook-form'
 import styled from 'styled-components'
 import { FormMeta, useEditMode } from '../form-meta'

package/src/edit-cells/EditableNumberCell.tsx

@@ -1,6 +1,6 @@
+import { TypographyCustom } from '@equinor/apollo-components'
 import { TextField } from '@equinor/eds-core-react'
 import { CellContext } from '@tanstack/react-table'
-import { TypographyCustom } from 'apollo-common'
 import { ChangeEvent } from 'react'
 import { Controller, useFormContext } from 'react-hook-form'
 import styled from 'styled-components'

package/src/edit-cells/EditableTextAreaCell.tsx

@@ -1,6 +1,6 @@
+import { PopoverCell, stopPropagation } from '@equinor/apollo-components'
 import { Button, Dialog as EDS, Icon, TextField } from '@equinor/eds-core-react'
 import { CellContext } from '@tanstack/react-table'
-import { PopoverCell, stopPropagation } from 'apollo-common'
 import { ChangeEvent, useState } from 'react'
 import { Controller, useFormContext } from 'react-hook-form'
 import styled from 'styled-components'
@@ -8,11 +8,11 @@ import { FormMeta, useEditMode } from '../form-meta'
 import { getHelperTextProps } from './utils'
 
 interface EdtiableTextAreaProps<T extends FormMeta> extends CellContext<T, string> {
-  dialogTitle: string
+  title: string
 }
 
 export function EditableTextAreaCell<T extends FormMeta>(props: EdtiableTextAreaProps<T>) {
-  const { dialogTitle, ...context } = props
+  const { title, ...context } = props
 
   const [textareaValue, setTextareaValue] = useState<string>(context.getValue())
   const [open, setOpen] = useState(false)
@@ -22,7 +22,7 @@ export function EditableTextAreaCell<T extends FormMeta>(props: EdtiableTextArea
   const name = context.column.id
 
   if (!editMode)
-    return <PopoverCell id={name + 'popover'} value={context.getValue()} title="Comment" />
+    return <PopoverCell id={name + 'popover'} value={context.getValue()} title={title} />
 
   const openDialog = () => setOpen(true)
   const closeDialog = () => setOpen(false)
@@ -64,7 +64,7 @@ export function EditableTextAreaCell<T extends FormMeta>(props: EdtiableTextArea
             style={{ width: 'min(50rem, calc(100vw - 4rem))' }}
           >
             <EDS.Header>
-              <EDS.Title>{dialogTitle}</EDS.Title>
+              <EDS.Title>{title}</EDS.Title>
             </EDS.Header>
             <EDS.Content>
               <TextField

package/src/edit-cells/EditableTextFieldCell.tsx

@@ -1,6 +1,6 @@
+import { TypographyCustom } from '@equinor/apollo-components'
 import { TextField } from '@equinor/eds-core-react'
 import { CellContext } from '@tanstack/react-table'
-import { TypographyCustom } from 'apollo-common'
 import { Controller, FieldPath, useFormContext } from 'react-hook-form'
 import styled from 'styled-components'
 import { FormMeta, useEditMode } from '../form-meta'

package/src/index.ts

@@ -1,3 +1,4 @@
-export * from 'apollo-common'
+export * from './edit-cells'
+export * from './form-meta'
 export * from './jotai-form'
 export * from './zod-validation'

package/.turbo/turbo-build.log

@@ -1,14 +0,0 @@
-$ tsup src/index.ts --format esm,cjs --dts --external react
-CLI Building entry: src/index.ts
-CLI Using tsconfig: tsconfig.json
-CLI tsup v6.6.3
-CLI Target: es6
-ESM Build start
-CJS Build start
-CJS dist/index.js 4.83 KB
-CJS ⚡️ Build success in 103ms
-ESM dist/index.mjs 3.53 KB
-ESM ⚡️ Build success in 107ms
-DTS Build start
-DTS ⚡️ Build success in 6256ms
-DTS dist/index.d.ts 2.03 KB

package/dist/index.d.ts

@@ -1,47 +0,0 @@
-export * from 'apollo-common';
-import { PrimitiveAtom } from 'jotai';
-import { AtomFamily } from 'jotai/vanilla/utils/atomFamily';
-import { z } from 'zod';
-
-type ValidationErrorMap<T> = Map<keyof T, {
-    message: string;
-    code: string;
-}>;
-
-declare function createValidator<S extends z.ZodTypeAny>(schema: S): {
-    validate: <E extends z.TypeOf<S>>(entity: E) => ValidationErrorMap<E> | undefined;
-    validateAsync: <E_1 extends z.TypeOf<S>>(entity: z.infer<typeof schema>) => Promise<ValidationErrorMap<E_1> | undefined>;
-    getSchema(): S;
-};
-
-type FormState<T> = {
-    status: 'editing' | 'pending';
-    values: T;
-    errors?: ValidationErrorMap<T>;
-    isValid?: boolean;
-};
-type FormFamilyParam = {
-    id: number | string;
-} & Record<string, unknown>;
-
-declare function createFormFamily<E extends Record<string, unknown>>(): AtomFamily<FormFamilyParam, PrimitiveAtom<FormState<E> | undefined> & {
-    init: FormState<E> | undefined;
-}>;
-type FormFamily<T> = AtomFamily<FormFamilyParam, PrimitiveAtom<FormState<T> | undefined>>;
-type FormValidator = ReturnType<typeof createValidator>;
-type UseFormFamilyUtilsOptions = {
-    validator?: FormValidator;
-};
-declare function useFormFamilyUtils<T>(family: FormFamily<T>, options?: UseFormFamilyUtilsOptions): {
-    useFormStateAtom: (param: FormFamilyParam) => [FormState<T> | undefined, (args_0: FormState<T> | ((prev: FormState<T> | undefined) => FormState<T> | undefined) | undefined) => void];
-    useFormState: (param: FormFamilyParam) => FormState<T> | undefined;
-    useUpdateFormMutation: (param: FormFamilyParam) => (update: Partial<T>) => void;
-    useFormMutations(param: FormFamilyParam): {
-        update: (update: Partial<T>) => void;
-        initializeForm: (entity: T) => void;
-        resetForm: () => void;
-    };
-};
-declare function useFormFamilyMutation<T>(family: FormFamily<T>, param: FormFamilyParam, validator?: FormValidator): (update: Partial<T>) => void;
-
-export { FormFamilyParam, FormState, ValidationErrorMap, createFormFamily, createValidator, useFormFamilyMutation, useFormFamilyUtils };

package/dist/index.js

@@ -1,149 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-
-// src/index.ts
-var src_exports = {};
-__export(src_exports, {
-  createFormFamily: () => createFormFamily,
-  createValidator: () => createValidator,
-  useFormFamilyMutation: () => useFormFamilyMutation,
-  useFormFamilyUtils: () => useFormFamilyUtils
-});
-module.exports = __toCommonJS(src_exports);
-__reExport(src_exports, require("apollo-common"), module.exports);
-
-// src/jotai-form/formUtils.ts
-var import_jotai = require("jotai");
-var import_utils = require("jotai/utils");
-function createFormFamily() {
-  return (0, import_utils.atomFamily)(
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    (_param) => (0, import_jotai.atom)(void 0),
-    (a, b) => a.id === b.id
-  );
-}
-function useFormFamilyUtils(family, options = {}) {
-  return {
-    useFormStateAtom: (param) => (0, import_jotai.useAtom)(family(param)),
-    useFormState: (param) => (0, import_jotai.useAtomValue)(family(param)),
-    useUpdateFormMutation: (param) => {
-      return useFormFamilyMutation(family, param, options.validator);
-    },
-    useFormMutations(param) {
-      const mutateAtom = (0, import_jotai.useSetAtom)(family(param));
-      return {
-        update: useFormFamilyMutation(family, param, options.validator),
-        initializeForm: (entity) => mutateAtom({
-          status: "editing",
-          values: entity,
-          isValid: true
-        }),
-        resetForm: () => mutateAtom(void 0)
-      };
-    }
-  };
-}
-function useFormFamilyMutation(family, param, validator) {
-  const mutate = (0, import_jotai.useSetAtom)(family(param));
-  return (update) => {
-    return mutate((previous) => {
-      if (!previous)
-        return;
-      const updatedValues = __spreadValues(__spreadValues({}, previous.values), update);
-      const errors = validator == null ? void 0 : validator.validate(updatedValues);
-      return {
-        status: "editing",
-        values: updatedValues,
-        errors,
-        isValid: !errors
-      };
-    });
-  };
-}
-
-// src/zod-validation/utils.ts
-function createValidator(schema) {
-  return {
-    validate: (entity) => {
-      const validation = schema.safeParse(entity);
-      if (validation.success)
-        return void 0;
-      return prepareErrors(validation);
-    },
-    validateAsync: (entity) => __async(this, null, function* () {
-      const validation = yield schema.safeParseAsync(entity);
-      if (validation.success)
-        return void 0;
-      return prepareErrors(validation);
-    }),
-    getSchema() {
-      return schema;
-    }
-  };
-}
-function prepareErrors(errorValidation) {
-  return new Map(
-    errorValidation.error.errors.map((error) => [
-      error.path[0],
-      { message: error.message, code: error.code }
-    ])
-  );
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createFormFamily,
-  createValidator,
-  useFormFamilyMutation,
-  useFormFamilyUtils
-});

package/dist/index.mjs

@@ -1,123 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-
-// src/index.ts
-export * from "apollo-common";
-
-// src/jotai-form/formUtils.ts
-import { atom, useAtom, useAtomValue, useSetAtom } from "jotai";
-import { atomFamily } from "jotai/utils";
-function createFormFamily() {
-  return atomFamily(
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    (_param) => atom(void 0),
-    (a, b) => a.id === b.id
-  );
-}
-function useFormFamilyUtils(family, options = {}) {
-  return {
-    useFormStateAtom: (param) => useAtom(family(param)),
-    useFormState: (param) => useAtomValue(family(param)),
-    useUpdateFormMutation: (param) => {
-      return useFormFamilyMutation(family, param, options.validator);
-    },
-    useFormMutations(param) {
-      const mutateAtom = useSetAtom(family(param));
-      return {
-        update: useFormFamilyMutation(family, param, options.validator),
-        initializeForm: (entity) => mutateAtom({
-          status: "editing",
-          values: entity,
-          isValid: true
-        }),
-        resetForm: () => mutateAtom(void 0)
-      };
-    }
-  };
-}
-function useFormFamilyMutation(family, param, validator) {
-  const mutate = useSetAtom(family(param));
-  return (update) => {
-    return mutate((previous) => {
-      if (!previous)
-        return;
-      const updatedValues = __spreadValues(__spreadValues({}, previous.values), update);
-      const errors = validator == null ? void 0 : validator.validate(updatedValues);
-      return {
-        status: "editing",
-        values: updatedValues,
-        errors,
-        isValid: !errors
-      };
-    });
-  };
-}
-
-// src/zod-validation/utils.ts
-function createValidator(schema) {
-  return {
-    validate: (entity) => {
-      const validation = schema.safeParse(entity);
-      if (validation.success)
-        return void 0;
-      return prepareErrors(validation);
-    },
-    validateAsync: (entity) => __async(this, null, function* () {
-      const validation = yield schema.safeParseAsync(entity);
-      if (validation.success)
-        return void 0;
-      return prepareErrors(validation);
-    }),
-    getSchema() {
-      return schema;
-    }
-  };
-}
-function prepareErrors(errorValidation) {
-  return new Map(
-    errorValidation.error.errors.map((error) => [
-      error.path[0],
-      { message: error.message, code: error.code }
-    ])
-  );
-}
-export {
-  createFormFamily,
-  createValidator,
-  useFormFamilyMutation,
-  useFormFamilyUtils
-};