Remove hook

twentyhq · Jan 17, 2024 · e94fb36 · e94fb36
1 parent 7d1e1aa
commit e94fb36
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 72 deletions.
diff --git a/packages/twenty-front/.storybook/main.ts b/packages/twenty-front/.storybook/main.ts
@@ -36,7 +36,6 @@ const config: StorybookConfig = {
     '@storybook/addon-themes',
     'storybook-addon-cookie',
     'storybook-addon-pseudo-states',
-    'storybook-addon-react-router-v6'
   ],
   framework: {
     name: '@storybook/react-vite',

diff --git a/packages/twenty-front/package.json b/packages/twenty-front/package.json
@@ -59,8 +59,5 @@
   },
   "msw": {
     "workerDirectory": "public"
-  },
-  "devDependencies": {
-    "storybook-addon-react-router-v6": "^2.0.10"
   }
 }
diff --git a/...bject-record/field/meta-types/display/components/__stories__/ChipFieldDisplay.stories.tsx b/...bject-record/field/meta-types/display/components/__stories__/ChipFieldDisplay.stories.tsx
@@ -1,7 +1,7 @@
 import { useEffect } from 'react';
+import { MemoryRouter } from 'react-router-dom';
 import { Meta, StoryObj } from '@storybook/react';
 import { useSetRecoilState } from 'recoil';
-import { withRouter } from 'storybook-addon-react-router-v6';
 
 import { identifierMapper } from '@/object-metadata/components/ObjectMetadataItemsRelationPickerEffect';
 import { ChipFieldDisplay } from '@/object-record/field/meta-types/display/components/ChipFieldDisplay';
@@ -34,31 +34,32 @@ const ChipFieldValueSetterEffect = () => {
 const meta: Meta = {
   title: 'UI/Data/Field/Display/ChipFieldDisplay',
   decorators: [
-    (Story, { args }) => (
-      <FieldContext.Provider
-        value={{
-          entityId: '123',
-          basePathToShowPage: '/object-record/',
-          isLabelIdentifier: false,
-          fieldDefinition: {
-            fieldMetadataId: 'full name',
-            label: 'Henry Cavill',
-            type: 'FULL_NAME',
-            iconName: 'IconCalendarEvent',
-            metadata: {
-              fieldName: 'full name',
-              objectMetadataNameSingular: 'person',
+    (Story) => (
+      <MemoryRouter>
+        <FieldContext.Provider
+          value={{
+            entityId: '123',
+            basePathToShowPage: '/object-record/',
+            isLabelIdentifier: false,
+            fieldDefinition: {
+              fieldMetadataId: 'full name',
+              label: 'Henry Cavill',
+              type: 'FULL_NAME',
+              iconName: 'IconCalendarEvent',
+              metadata: {
+                fieldName: 'full name',
+                objectMetadataNameSingular: 'person',
+              },
             },
-          },
-          hotkeyScope: 'hotkey-scope',
-        }}
-      >
-        <ChipFieldValueSetterEffect />
-        <Story />
-      </FieldContext.Provider>
+            hotkeyScope: 'hotkey-scope',
+          }}
+        >
+          <ChipFieldValueSetterEffect />
+          <Story />
+        </FieldContext.Provider>
+      </MemoryRouter>
     ),
     ComponentDecorator,
-    withRouter,
   ],
   component: ChipFieldDisplay,
   argTypes: { value: { control: 'date' } },

diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useRelationPicker.ts b/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useRelationPicker.ts
@@ -20,7 +20,7 @@ export const useRelationPicker = (props?: useRelationPickeProps) => {
     relationPickerSearchFilterState,
     relationPickerPreselectedIdState,
   } = useRelationPickerScopedStates({
-    relationPickerScopedId: 'relation-picker',
+    relationPickerScopedId: scopeId,
   });
 
   const [identifiersMapper, setIdentifiersMapper] = useRecoilState(

diff --git a/yarn.lock b/yarn.lock
@@ -20531,13 +20531,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"compare-versions@npm:^6.0.0":
-  version: 6.1.0
-  resolution: "compare-versions@npm:6.1.0"
-  checksum: 5378edc8a53ac98ed907da463e1d6c26f1ed2664006d6a0d54bbdf7f046a36c43e244740854fc0edfc1e09253b9a0b7c98d1282dfee9f6f1a87199599f611218
-  languageName: node
-  linkType: hard
-
 "component-emitter@npm:^1.3.0":
   version: 1.3.1
   resolution: "component-emitter@npm:1.3.1"
@@ -37681,15 +37674,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-inspector@npm:6.0.2":
-  version: 6.0.2
-  resolution: "react-inspector@npm:6.0.2"
-  peerDependencies:
-    react: ^16.8.4 || ^17.0.0 || ^18.0.0
-  checksum: 8f9b23c21b4d95722e28c9455c2bf00fd9437347714382594461f98e5b9954d60864d0f4e74e881639b065e752a97ba52a65e39930c234072e5bff291bb02b5e
-  languageName: node
-  linkType: hard
-
 "react-intersection-observer@npm:^9.5.2":
   version: 9.5.3
   resolution: "react-intersection-observer@npm:9.5.3"
@@ -40729,32 +40713,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"storybook-addon-react-router-v6@npm:^2.0.10":
-  version: 2.0.10
-  resolution: "storybook-addon-react-router-v6@npm:2.0.10"
-  dependencies:
-    compare-versions: "npm:^6.0.0"
-    react-inspector: "npm:6.0.2"
-  peerDependencies:
-    "@storybook/blocks": ^7.0.0
-    "@storybook/channels": ^7.0.0
-    "@storybook/components": ^7.0.0
-    "@storybook/core-events": ^7.0.0
-    "@storybook/manager-api": ^7.0.0
-    "@storybook/preview-api": ^7.0.0
-    "@storybook/theming": ^7.0.0
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    react-router-dom: ^6.4.0
-  peerDependenciesMeta:
-    react:
-      optional: true
-    react-dom:
-      optional: true
-  checksum: c7a9684956122563aad0443bf09a264de026c953b492c572d571d7eb9cd2ba692a638d7aa899fb944c158710fe9295668480dcabe6cd11ff5679f9c698b928e1
-  languageName: node
-  linkType: hard
-
 "storybook@npm:^7.6.3":
   version: 7.6.7
   resolution: "storybook@npm:7.6.7"
@@ -42360,8 +42318,6 @@ __metadata:
 "twenty-front@workspace:packages/twenty-front":
   version: 0.0.0-use.local
   resolution: "twenty-front@workspace:packages/twenty-front"
-  dependencies:
-    storybook-addon-react-router-v6: "npm:^2.0.10"
   languageName: unknown
   linkType: soft