Update wayfinder and improve advanced mapping

apideck-libraries · Nov 2, 2023 · 8c12fc4 · 8c12fc4
1 parent 1ddc07d
commit 8c12fc4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@apideck/components": "^0.12.9",
-    "@apideck/wayfinder": "^0.1.9",
+    "@apideck/wayfinder": "^0.2.2",
     "formik": "^2.2.9",
     "fuse.js": "^6.5.3",
     "jwt-decode": "^3.1.2",

diff --git a/src/components/FieldMappingForm.tsx b/src/components/FieldMappingForm.tsx
@@ -7,7 +7,7 @@ import { useConnections } from '../utils/useConnections';
 import { useSession } from '../utils/useSession';
 import FieldSelector from './FieldSelector';
 
-const findByDescription = (obj: any, description: string): any => {
+export const findByDescription = (obj: any, description: string): any => {
   for (const key in obj) {
     if (obj[key] instanceof Object) {
       const result = findByDescription(obj[key], description);

diff --git a/src/components/FieldSelector.tsx b/src/components/FieldSelector.tsx
@@ -15,7 +15,9 @@ import React, {
   useState,
 } from 'react';
 import useSWR from 'swr';
+import { extractLastAttribute } from '../utils/extractLastAttribute';
 import { useConnections } from '../utils/useConnections';
+import { findByDescription } from './FieldMappingForm';
 
 interface Props {
   onSelect: (field: any) => void;
@@ -408,11 +410,16 @@ const FieldSelector = ({
                                 onSelect={(jsonPath) => {
                                   if (jsonPath) {
                                     setFieldMappingString(jsonPath);
+                                    const mappingObject = findByDescription(
+                                      properties,
+                                      jsonPath
+                                    );
                                     onSelect({
-                                      title: jsonPath,
+                                      title: extractLastAttribute(jsonPath),
                                       mode: 'manual',
-                                      type: 'Advanced',
+                                      type: mappingObject?.type || 'Advanced',
                                       description: jsonPath,
+                                      example: mappingObject?.example,
                                     });
                                   }
                                   removeModal();
@@ -423,6 +430,7 @@ const FieldSelector = ({
                                   null,
                                   2
                                 )}
+                                defaultJsonPath={fieldMappingString}
                               />,
                               {
                                 className: '!max-w-5xl !p-0',

diff --git a/yarn.lock b/yarn.lock
@@ -13,10 +13,10 @@
     postinstall-postinstall "^2.1.0"
     use-clipboard-copy "^0.2.0"
 
-"@apideck/wayfinder@^0.1.9":
-  version "0.1.9"
-  resolved "https://registry.yarnpkg.com/@apideck/wayfinder/-/wayfinder-0.1.9.tgz#bfaa55d632236a0341adadb95ffecd4d8d62ca12"
-  integrity sha512-MkOMqKD6YuVPnBWZCkYMi080AmzaAYiJ4J7VvHy8iIK1Ilo/2qJwNtYQVErhBgtqUA7GRqojQp3hxwwEZDvTmw==
+"@apideck/wayfinder@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@apideck/wayfinder/-/wayfinder-0.2.2.tgz#7b9debda5048b26e25802f7f0ce44d76efd16b1e"
+  integrity sha512-OzjX7zgvINch+C4jrj80XEs7Fmt4W45CGz3uryUqhf9grzL3RA6wvqXjoehFROmdXN5FXts2XQmNiPHcP7HQww==
   dependencies:
     "@monaco-editor/react" "^4.6.0"
     classnames "2.3.2"