Merge pull request #36 from 8base/add-form-data-callbacks

zouxuoz · web-flow · commit edf643bbf696 · 2020-08-21T13:27:02.000+03:00
feat(forms): add form data callbacks
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -0,0 +1,31 @@
+name: checks
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Install Dependencies
+        run: yarn --frozen-lockfile
+
+      - name: Build packages
+        run: yarn build-packages
+
+      - name: Run linter
+        run: yarn lint
+
+      - name: Run prettier
+        run: yarn prettier:check
+
+      - name: Run tests
+        run: yarn test
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -0,0 +1,33 @@
+name: publish
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install Dependencies
+        run: yarn --frozen-lockfile
+
+      - name: Build packages
+        run: yarn build-packages
+
+      - name: Run linter
+        run: yarn lint
+
+      - name: Run prettier
+        run: yarn prettier:check
+
+      - name: Run tests
+        run: yarn test
+
+      - name: Publish
+        run: sh ./bin/pubpish.sh
+
+      env:
+        NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
diff --git a/.travis.yml b/.travis.yml
diff --git a/bin/try-publish.sh b/bin/try-publish.sh
@@ -18,9 +18,9 @@ fi
 
 if [ "$published" != "$version" ]; then
   echo "Try to publish $version version of the $name package."
-  echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > .npmrc
+  echo "//registry.npmjs.org/:_authToken=\${NPM_AUTH_TOKEN}" > .npmrc
   npm publish --access public; if [ "$?" != "0" ]; then status=1; fi
-else 
+else
   echo "Current version of the package already published to the NPM."
 fi
 
@@ -32,4 +32,4 @@ else
   echo -e "\n\033[0;32mThe try to publish for \"${package}\" exited with 0\033[0m\n"
 fi
 
-exit $status
+exit $status
diff --git a/packages/8base-react-sdk/package.json b/packages/8base-react-sdk/package.json
@@ -4,6 +4,7 @@
   "repository": "https://github.com/8base/react-sdk",
   "main": "dist/index.js",
   "module": "dist/index.js",
+  "typings": "dist/index.d.ts",
   "scripts": {
     "build": "../../bin/build-package.sh",
     "watch": "../../bin/watch-package.sh",
diff --git a/packages/app-provider/package.json b/packages/app-provider/package.json
@@ -5,6 +5,7 @@
   "homepage": "https://github.com/8base/react-sdk/tree/master/packages/app-provider#readme",
   "main": "dist/index.js",
   "module": "dist/index.js",
+  "typings": "dist/index.d.ts",
   "scripts": {
     "build": "../../bin/build-package.sh",
     "watch": "../../bin/watch-package.sh",
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -5,6 +5,7 @@
   "homepage": "https://github.com/8base/react-sdk/tree/master/packages/react-auth#readme",
   "main": "dist/index.js",
   "module": "dist/index.js",
+  "typings": "dist/index.d.ts",
   "scripts": {
     "build": "../../bin/build-package.sh",
     "watch": "../../bin/watch-package.sh",
diff --git a/packages/crud/package.json b/packages/crud/package.json
@@ -5,6 +5,7 @@
   "homepage": "https://github.com/8base/react-sdk/tree/master/packages/crud#readme",
   "main": "dist/index.js",
   "module": "dist/index.js",
+  "typings": "dist/index.d.ts",
   "scripts": {
     "build": "../../bin/build-package.sh",
     "watch": "../../bin/watch-package.sh"
diff --git a/packages/file-input/package.json b/packages/file-input/package.json
@@ -5,6 +5,7 @@
   "homepage": "https://github.com/8base/react-sdk/tree/master/packages/file-input#readme",
   "main": "dist/index.js",
   "module": "dist/index.js",
+  "typings": "dist/index.d.ts",
   "scripts": {
     "build": "../../bin/build-package.sh",
     "watch": "../../bin/watch-package.sh",
diff --git a/packages/forms/package.json b/packages/forms/package.json
@@ -5,6 +5,7 @@
   "homepage": "https://github.com/8base/react-sdk/tree/master/packages/forms#readme",
   "main": "dist/index.js",
   "module": "dist/index.js",
+  "typings": "dist/index.d.ts",
   "scripts": {
     "build": "../../bin/build-package.sh",
     "watch": "../../bin/watch-package.sh",
@@ -23,13 +24,13 @@
     "@8base/error-codes": "^1.0.21",
     "@8base/utils": "^1.2.8",
     "@8base/validate": "^1.2.8",
-    "final-form": "^4.16.1",
-    "final-form-arrays": "^1.1.2",
+    "final-form": "^4.20.1",
+    "final-form-arrays": "^3.0.2",
     "graphql-tag": "^2.10.0",
     "prop-types": "^15.6.1",
     "ramda": "^0.26.1",
-    "react-final-form": "^6.3.0",
-    "react-final-form-arrays": "^3.1.0"
+    "react-final-form": "^6.5.1",
+    "react-final-form-arrays": "^3.1.2"
   },
   "devDependencies": {
     "@babel/core": "^7.4.3",
diff --git a/packages/forms/src/Form.tsx b/packages/forms/src/Form.tsx
@@ -29,6 +29,10 @@ const Form = ({
   appName,
   formatRelationToIds,
   ignoreNonTableFields,
+  beforeFormatDataForMutation,
+  afterFormatDataForMutation,
+  beforeFormatQueryData,
+  afterFormatQueryData,
   onSuccess,
   ...props
 }: FormProps) => {
@@ -40,6 +44,10 @@ const Form = ({
   if (tableSchemaName && tablesList) {
     tableSchema = tablesListSelectors.getTableByName(tablesList, tableSchemaName, appName);
 
+    if (beforeFormatQueryData) {
+      props.initialValues = beforeFormatQueryData(props.initialValues);
+    }
+
     if (tableSchema && type === MUTATION_TYPE.UPDATE && props.initialValues) {
       props.initialValues = formatDataAfterQuery(
         props.initialValues,
@@ -52,6 +60,10 @@ const Form = ({
         },
       );
 
+      if (afterFormatQueryData) {
+        props.initialValues = afterFormatQueryData(props.initialValues);
+      }
+
       props.initialValuesEqual = R.equals;
     }
 
@@ -79,13 +91,18 @@ const Form = ({
     {
       onSubmit: onSubmit => async (data: any, ...rest: any) => {
         let result = null;
+        let formattedData = data;
+
+        if (beforeFormatDataForMutation) {
+          formattedData = beforeFormatDataForMutation(data);
+        }
 
         try {
-          const formattedData =
+          formattedData =
             type && tableSchema && tablesList
               ? formatDataForMutation(
                   type,
-                  data,
+                  formattedData,
                   {
                     tableName: tableSchema.name,
                     schema: tablesList,
@@ -96,7 +113,11 @@ const Form = ({
                     skip: permissions && skipData,
                   },
                 )
-              : data;
+              : formattedData;
+
+          if (afterFormatDataForMutation) {
+            formattedData = afterFormatDataForMutation(formattedData);
+          }
 
           // @ts-ignore
           result = await onSubmit(formattedData, ...rest);
diff --git a/packages/forms/src/types.ts b/packages/forms/src/types.ts
@@ -1,11 +1,7 @@
 import React from 'react';
-import { FormApi, FieldState as FinalFieldState } from 'final-form';
+import { FormApi } from 'final-form';
 import { FormProps as FinalFormProps, FieldProps as FinalFieldProps } from 'react-final-form';
-import { FieldArrayProps as FinalFieldArrayProps } from 'react-final-form-arrays';
 import { FieldType, TableSchema, FieldSchema, Schema } from '@8base/utils';
-import { PreparedValidator } from '@8base/validate';
-
-type SchemaContextValue = Schema;
 
 type RenderableProps = {
   component?: React.ComponentType<any>;
@@ -27,6 +23,10 @@ type FormProps<FormValues = any> = {
   formatRelationToIds?: boolean;
   permissions?: any;
   onSuccess?: (result: any, form: FormApi) => void;
+  beforeFormatDataForMutation?: <T_OUT = object>(formValues: FormValues) => T_OUT;
+  afterFormatDataForMutation?: <T_IN = object, T_OUT = object>(data: T_IN) => T_OUT;
+  beforeFormatQueryData?: <T_IN = object, T_OUT = object>(data: T_IN) => T_OUT;
+  afterFormatQueryData?: <T = object>(data: T) => FormValues;
 } & FinalFormProps<FormValues>;
 
 type FieldsetProps = {
@@ -43,7 +43,6 @@ export {
   FormContextValue,
   FormProps,
   Schema,
-  SchemaContextValue,
   TableSchema,
   RenderableProps,
 };
diff --git a/packages/permissions-provider/package.json b/packages/permissions-provider/package.json
@@ -5,6 +5,7 @@
   "homepage": "https://github.com/8base/react-sdk/tree/master/packages/permissions-provider#readme",
   "main": "dist/index.js",
   "module": "dist/index.js",
+  "typings": "dist/index.d.ts",
   "scripts": {
     "build": "../../bin/build-package.sh",
     "watch": "../../bin/watch-package.sh",
diff --git a/packages/table-schema-provider/package.json b/packages/table-schema-provider/package.json
@@ -5,6 +5,7 @@
   "homepage": "https://github.com/8base/react-sdk/tree/master/packages/table-schema-provider#readme",
   "main": "dist/index.js",
   "module": "dist/index.js",
+  "typings": "dist/index.d.ts",
   "scripts": {
     "build": "../../bin/build-package.sh",
     "watch": "../../bin/watch-package.sh",
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -5,7 +5,7 @@
   "homepage": "https://github.com/8base/react-sdk/tree/master/packages/utils#readme",
   "main": "dist/index.js",
   "module": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "typings": "dist/index.d.ts",
   "scripts": {
     "build": "../../bin/build-package.sh",
     "watch": "../../bin/watch-package.sh",
diff --git a/yarn.lock b/yarn.lock
@@ -1045,13 +1045,20 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.5":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.5":
   version "7.6.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.2.tgz#c3d6e41b304ef10dcf13777a33e7694ec4a9a6dd"
   integrity sha512-EXxN64agfUqqIGeEjI5dL5z0Sw0ZwWo1mLTi4mQowCZ42O59b7DRpZAnTC6OqdF28wMBMFKNb/4uFGrVaigSpg==
   dependencies:
     regenerator-runtime "^0.13.2"
 
+"@babel/runtime@^7.10.0":
+  version "7.11.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
+  integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/template@^7.1.0", "@babel/template@^7.4.0", "@babel/template@^7.4.4", "@babel/template@^7.6.0":
   version "7.6.0"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.6.0.tgz#7f0159c7f5012230dad64cca42ec9bdb5c9536e6"
@@ -5826,17 +5833,17 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
-final-form-arrays@^1.1.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/final-form-arrays/-/final-form-arrays-1.2.0.tgz#8b7ff78a5bb917d1b3bd40ba02e67710b0a23d08"
-  integrity sha512-7wC38TOHO4LBcKW5Cp14CXefT985nOsuLt+cibiYVTRWiiYmxytxkJpu43wy8gMpDrJPinw3LXRW2AJdJx3eyw==
+final-form-arrays@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/final-form-arrays/-/final-form-arrays-3.0.2.tgz#9f3bef778dec61432357744eb6f3abef7e7f3847"
+  integrity sha512-TfO8aZNz3RrsZCDx8GHMQcyztDNpGxSSi9w4wpSNKlmv2PfFWVVM8P7Yj5tj4n0OWax+x5YwTLhT5BnqSlCi+w==
 
-final-form@^4.16.1:
-  version "4.18.5"
-  resolved "https://registry.yarnpkg.com/final-form/-/final-form-4.18.5.tgz#e359cfaf2892ef135d92fcf22e06b475dda3a885"
-  integrity sha512-DH/I2W7fWxU8J8ZsbYJ5jLvUbhbatCvLhIKlsU17MvY6W3QnetPEyuX5mcxXgIGFNFKxfvqsG3pDy/1/VwOiTw==
+final-form@^4.20.1:
+  version "4.20.1"
+  resolved "https://registry.yarnpkg.com/final-form/-/final-form-4.20.1.tgz#525a7f7f27f55c28d8994b157b24d6104fc560e9"
+  integrity sha512-IIsOK3JRxJrN72OBj7vFWZxtGt3xc1bYwJVPchjVWmDol9DlzMSAOPB+vwe75TUYsw1JaH0fTQnIgwSQZQ9Acg==
   dependencies:
-    "@babel/runtime" "^7.3.1"
+    "@babel/runtime" "^7.10.0"
 
 finalhandler@~1.1.2:
   version "1.1.2"
@@ -10807,20 +10814,19 @@ react-error-overlay@^6.0.3:
   resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.3.tgz#c378c4b0a21e88b2e159a3e62b2f531fd63bf60d"
   integrity sha512-bOUvMWFQVk5oz8Ded9Xb7WVdEi3QGLC8tH7HmYP0Fdp4Bn3qw0tRFmr5TW6mvahzvmrK4a6bqWGfCevBflP+Xw==
 
-react-final-form-arrays@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/react-final-form-arrays/-/react-final-form-arrays-3.1.1.tgz#39d23e7ede966e418cad209e8fde46da1d603e99"
-  integrity sha512-e6S1x9597cvI4QPniOPmllXXandDAqCCuBo4AvXstZYgcV8whsqzk8aCrmQEy6eEfy2tEhvn6f4VI1GY+JBRsg==
+react-final-form-arrays@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/react-final-form-arrays/-/react-final-form-arrays-3.1.2.tgz#391ceee29d866f2128c807b510c6a17ff4dc72cc"
+  integrity sha512-ds1FUS8s3AnfbvfmBTPnjijS7veKBr6DrWOGQzDI7grE4OosVWOREwd2ZUkz3HPB3wXQcNWsqyDuQDBSMGUr2g==
   dependencies:
     "@babel/runtime" "^7.4.5"
 
-react-final-form@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/react-final-form/-/react-final-form-6.3.0.tgz#b85ae123a3796b3e0c8f56033c8a5037f4497e76"
-  integrity sha512-jijhXR1fFGUBQwNOSqF4MK8XJO7Ynl1p8vcFsnQS0INSkGI52+4IagjUgtHj3w8EviIHPFK/Eflji6FELUl07w==
+react-final-form@^6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/react-final-form/-/react-final-form-6.5.1.tgz#baf798129d459c669cfda5ce60a77801ef52badc"
+  integrity sha512-+Hzd9PqYY1Cv3MnWzw64QOl5BjC5BtSDakx+N7Re49r0FASdFhgpXLFFCJ31fvegq2euP6hz6Ow9K6XM9BSqCA==
   dependencies:
-    "@babel/runtime" "^7.4.5"
-    ts-essentials "^2.0.8"
+    "@babel/runtime" "^7.10.0"
 
 react-is@^16.6.0:
   version "16.10.2"
@@ -11149,6 +11155,11 @@ regenerator-runtime@^0.11.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
+regenerator-runtime@^0.13.4:
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
+  integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
+
 regenerator-transform@^0.14.0:
   version "0.14.1"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz#3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb"
@@ -12552,11 +12563,6 @@ trim-off-newlines@^1.0.0:
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
   integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM=
 
-ts-essentials@^2.0.8:
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-2.0.12.tgz#c9303f3d74f75fa7528c3d49b80e089ab09d8745"
-  integrity sha512-3IVX4nI6B5cc31/GFFE+i8ey/N2eA0CZDbo6n0yrz0zDX8ZJ8djmU1p+XRz7G3is0F3bB3pu2pAroFdAWQKU3w==
-
 ts-invariant@^0.3.2:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.3.3.tgz#b5742b1885ecf9e29c31a750307480f045ec0b16"
