@integration-app/react 0.2.0 → 0.2.1

package/src/hooks/useElement.tsx

@@ -4,7 +4,7 @@ import {
   ElementInstanceAccessor,
 } from '@integration-app/sdk'
 import { useEffect, useState } from 'react'
-import { useIntegrationApp } from '../contexts/integration-app-context'
+import { useIntegrationApp } from 'contexts/integration-app-context'
 
 interface ElementHookResult<
   ElementInterface,
@@ -88,6 +88,19 @@ export function useElement<
   const [error, setError] = useState<Error>(null)
   const [refreshCounter, setRefreshCounter] = useState(0)
 
+  function updateDataWith(newData) {
+    if (data !== undefined) {
+      setData({
+        ...data,
+        ...newData,
+      })
+    }
+  }
+
+  function replaceDataWith(newData) {
+    setData(newData)
+  }
+
   const selector = (props as any)?.id
     ? (props as { id: string }).id
     : (props as SelectorInterface)
@@ -99,7 +112,7 @@ export function useElement<
   useEffect(() => {
     setLoading(true)
     setError(null)
-    if (integrationApp) {
+    if (integrationApp && selector) {
       accessor
         .get()
         .then(setData)
@@ -112,16 +125,21 @@ export function useElement<
         ),
       )
     }
-  }, [integrationApp, JSON.stringify(props), refreshCounter])
+  }, [
+    integrationApp,
+    JSON.stringify(selector),
+    JSON.stringify(props),
+    refreshCounter,
+  ])
 
   async function create(createData: CreateRequest) {
-    if (data !== undefined) {
-      setData({
-        ...data,
-        ...createData,
-      })
-    }
-    return accessorGenerator(integrationApp)(selector).create(createData)
+    // Because `createData` do not contain all critical fields
+    // we do not update state with `createData` to avoid problem
+    // with missing critical fields like `id`
+
+    const returnedData = await accessor.create(createData)
+    replaceDataWith(returnedData)
+    return returnedData
   }
 
   function refresh() {
@@ -130,29 +148,29 @@ export function useElement<
 
   async function patch(patch: UpdateRequest) {
     if (typeof patch === 'object') {
-      setData({
-        ...data,
-        ...(patch ?? {}),
-      })
-      return accessorGenerator(integrationApp)(selector).patch(patch)
+      updateDataWith(patch ?? {})
+
+      // TODO: PL-3550
+      // PATCH could response with modified fields that do not exist in `patch`
+      // but this data could be outdated because of other methods calls
+      return accessor.patch(patch)
     } else {
       return data
     }
   }
 
   async function put(putData: CreateRequest) {
-    if (data !== undefined) {
-      setData({
-        ...data,
-        ...putData,
-      })
-    }
-    return accessorGenerator(integrationApp)(selector).put(putData)
+    updateDataWith(putData)
+
+    // TODO: PL-3550
+    // PUT could response with modified fields that do not exist in `patch`
+    // but this data could be outdated because of other methods calls
+    return await accessor.put(putData)
   }
 
   async function archive() {
     setData(null)
-    return accessorGenerator(integrationApp)(selector).archive()
+    return accessor.archive()
   }
 
   return {

package/src/index.tsx

@@ -3,7 +3,7 @@ export {
   IntegrationAppProvider,
 } from './contexts/integration-app-context.js'
 
-export { useConnectorSpec } from './integrations/useConnectionSpec.js'
+export { useConnectorSpec } from './integrations/useConnectorSpec.js'
 export { useIntegration } from './integrations/useIntegration.js'
 export { useIntegrations } from './integrations/useIntegrations.js'
 export { useConnection } from './integrations/useConnection.js'
@@ -11,13 +11,13 @@ export { useConnections } from './integrations/useConnections.js'
 
 export { useFieldMapping } from './field-mappings/useFieldMapping.js'
 export { useFieldMappings } from './field-mappings/useFieldMappings.js'
-
 export { useFieldMappingInstance } from './field-mappings/useFieldMappingInstance.js'
 export { useFieldMappingInstances } from './field-mappings/useFieldMappingInstances.js'
 
 export { useDataSource } from './data-sources/useDataSource.js'
 export { useDataSources } from './data-sources/useDataSources.js'
 export { useDataSourceInstance } from './data-sources/useDataSourceInstance.js'
+export { useDataSourceInstances } from './data-sources/useDataSourceInstances.js'
 export { useDataSourceInstanceCollection as useDataSourceCollection } from './data-sources/useDataSourceInstanceCollection.js'
 export { useDataSourceInstanceLocations as useDataSourceLocations } from './data-sources/useDataSourceInstanceLocations.js'
 export { useDataSourceEvents } from './data-sources/useDataSourceEvents.js'

package/rollup.config.mjs

@@ -1,64 +0,0 @@
-// Compile TypeScript files
-import typescript from '@rollup/plugin-typescript'
-// Convert CommonJS modules to ES6, so they can be included in a Rollup bundle
-import commonjs from '@rollup/plugin-commonjs'
-// Locate modules using the Node resolution algorithm, for using third party modules in node_modules
-import nodeResolve from '@rollup/plugin-node-resolve'
-// Flat dts files into one
-import dts from 'rollup-plugin-dts'
-// Convert .json files to ES6 modules
-import rollupJson from '@rollup/plugin-json'
-
-const config = [
-  {
-    input: './src/index.tsx',
-    output: [
-      {
-        // CommonJS bundle
-        file: './dist/index.js',
-        format: 'cjs',
-        sourcemap: true,
-      },
-      {
-        // ESM bundle
-        file: './dist/index.module.mjs',
-        format: 'esm',
-        sourcemap: true,
-      },
-      {
-        // Universal Module Definition, works as `amd`, `cjs` and `iife` all in one
-        file: './dist/index.umd.js',
-        format: 'umd',
-        name: 'integrationAppReact',
-        sourcemap: true,
-      },
-    ],
-    external: [/node_modules/, '@integration-app/sdk'],
-    plugins: [
-      typescript({
-        tsconfig: 'tsconfig.json',
-      }),
-      commonjs(),
-      nodeResolve({
-        browser: true,
-      }),
-      rollupJson(),
-    ],
-  },
-  // Generate dts files for each bundle from *.d.ts files
-  {
-    input: './dist/dts/index.d.ts',
-    output: [
-      { file: 'dist/index.d.ts', format: 'commonjs' },
-      { file: 'dist/index.module.d.ts', format: 'es' },
-      {
-        file: 'dist/index.umd.d.ts',
-        format: 'umd',
-        name: 'integrationAppReact',
-      },
-    ],
-    plugins: [dts()],
-  },
-]
-
-export default config