[fix] Selection in Trees in stories

agentlab · Dec 31, 2021 · 8104f03 · 8104f03
1 parent b7c31ed
commit 8104f03
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/src/data-controls/TreeRenderer.tsx b/src/data-controls/TreeRenderer.tsx
@@ -263,7 +263,7 @@ export const TreeRenderer: React.FC<any> = (props) => {
       />
       <Tree
         selectedKeys={selectedKey}
-        draggable
+        draggable={{ icon: false }}
         onExpand={onExpand}
         expandedKeys={expandedKeys}
         autoExpandParent={autoExpandParent}

diff --git a/stories/QueryTreeTableArtifacts.stories.tsx b/stories/QueryTreeTableArtifacts.stories.tsx
@@ -261,6 +261,7 @@ const viewKinds = [
                       //from: 'selector', // inner UI component variable name in case it has several variables? e.g. drag, moveX/moveY, width/height?
                       toObj: 'rm:Artifacts_Coll_Cond',
                       toProp: 'assetFolder',
+                      fromProp: '@id',
                     },
                   ],
                 },

diff --git a/stories/TreeTableFormMktp.stories.tsx b/stories/TreeTableFormMktp.stories.tsx
@@ -183,7 +183,9 @@ const viewKinds = [
                   title: 'WildBerries',
                   treeNodeTitleKey: 'name',
                   treeNodeParentKey: 'SubcatInCatLink',
-                  connections: [{ toObj: 'mktp:ProductCards_in_Category_Coll_Ent0_con', toProp: 'CardInCatLink' }],
+                  connections: [
+                    { toObj: 'mktp:ProductCards_in_Category_Coll_Ent0_con', toProp: 'CardInCatLink', fromProp: '@id' },
+                  ],
                 },
               },
               {

diff --git a/stories/TwoTables.stories.tsx b/stories/TwoTables.stories.tsx
@@ -178,7 +178,13 @@ const viewKinds = [
                       title: 'WildBerries',
                       treeNodeTitleKey: 'name',
                       treeNodeParentKey: 'SubcatInCatLink',
-                      connections: [{ toObj: 'mktp:ProductCards_in_Category_Coll_Ent0_con', toProp: 'CardInCatLink' }],
+                      connections: [
+                        {
+                          toObj: 'mktp:ProductCards_in_Category_Coll_Ent0_con',
+                          toProp: 'CardInCatLink',
+                          fromProp: '@id',
+                        },
+                      ],
                     },
                   },
                   {
@@ -629,7 +635,9 @@ const viewKinds = [
                   title: 'Продукты',
                   treeNodeTitleKey: 'title',
                   treeNodeParentKey: 'SubProdInProdLink',
-                  connections: [{ toObj: 'mktp:ProductCards_in_Product_Coll_Ent0_Cond', toProp: 'CardInProdLink' }],
+                  connections: [
+                    { toObj: 'mktp:ProductCards_in_Product_Coll_Ent0_Cond', toProp: 'CardInProdLink', fromProp: '@id' },
+                  ],
                 },
               },
             ],

diff --git a/stories/TwoTablesBig.stories.tsx b/stories/TwoTablesBig.stories.tsx
@@ -221,7 +221,9 @@ const viewKinds = [
                   title: 'Категории маркетплейса',
                   treeNodeTitleKey: 'name',
                   treeNodeParentKey: 'SubcatInCatLink',
-                  connections: [{ toObj: 'mktp:ProductCards_in_Category_Coll_Ent_con', toProp: 'CardInCatLink' }],
+                  connections: [
+                    { toObj: 'mktp:ProductCards_in_Category_Coll_Ent_con', toProp: 'CardInCatLink', fromProp: '@id' },
+                  ],
                 },
               },
               {
@@ -619,7 +621,9 @@ const viewKinds = [
                   title: 'Продукты',
                   treeNodeTitleKey: 'title',
                   treeNodeParentKey: 'SubProdInProdLink',
-                  connections: [{ toObj: 'mktp:ProductCards_in_Product_Coll_Ent_Cond', toProp: 'CardInProdLink' }],
+                  connections: [
+                    { toObj: 'mktp:ProductCards_in_Product_Coll_Ent_Cond', toProp: 'CardInProdLink', fromProp: '@id' },
+                  ],
                 },
               },
             ],