@teambit/workspace 1.0.420 → 1.0.422

package/dist/{preview-1727810275935.js → preview-1727925619885.js}

@@ -1,5 +1,5 @@
-import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.420/dist/workspace.composition.js';
-import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.420/dist/workspace.docs.mdx';
+import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.422/dist/workspace.composition.js';
+import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.422/dist/workspace.docs.mdx';
 
 export const compositions = [compositions_0];
 export const overview = [overview_0];

package/dist/workspace.ui.drawer.js

@@ -69,14 +69,6 @@ const workspaceDrawer = ({
             // non collapse
             return /*#__PURE__*/_react().default.createElement(_uiFoundationUi().ComponentView, _extends({}, props, {
               treeNodeSlot: treeNodeSlot
-              /**
-               * this is a hack to get around incompatible component id b/w the new sidebar and components in this workspace
-               * the new sidebar has been tagged with the new LanesModel component which has been upgraded to a new major component id version
-               * which makes it incompatible with all other components in this workspace
-               *
-               * hopefully when wave gets released it becomes seamless to update all dependents for a given version
-               */,
-              useLanes: useLanes
             }));
           }
           if (props.node.payload instanceof _uiFoundationUi().ScopePayload) return /*#__PURE__*/_react().default.createElement(_uiFoundationUi().ScopeTreeNode, props);

package/dist/workspace.ui.drawer.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","data","_interopRequireWildcard","require","_componentUi","_uiFoundationUi","_lanesHooks","_lanesHooks2","_workspaceContext","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","_extends","assign","bind","arguments","length","apply","workspaceDrawer","treeWidgets","filtersSlot","drawerWidgetSlot","overrideUseLanes","useLanesFromProps","useLanes","defaultUseLanesHook","ComponentsDrawer","order","id","name","plugins","tree","widgets","customRenderer","treeNodeSlot","TreeNode","props","children","node","createElement","ComponentView","payload","ScopePayload","ScopeTreeNode","NamespaceTreeNode","filters","drawerWidgets","emptyMessage","useComponents","lanesModel","loading","lanesLoading","viewedLaneId","viewedLane","defaultLane","getDefaultLane","isViewingDefaultLane","isEqual","isViewingWorkspaceVersions","isViewingCurrentLane","components","laneComponents","laneCompsLoading","useLaneComponents","undefined","mainComponents","mainCompsLoading","workspace","useContext","WorkspaceContext","workspaceComponents","mergeComponents","exports","mainComponentsThatAreNotOnLane","filter","mainComponent","find","laneComponent","toStringWithoutVersion","concat"],"sources":["workspace.ui.drawer.tsx"],"sourcesContent":["import React, { useContext } from 'react';\nimport { ComponentsDrawer, ComponentFiltersSlot, DrawerWidgetSlot } from '@teambit/component.ui.component-drawer';\nimport { ComponentView, NamespaceTreeNode, ScopePayload, ScopeTreeNode } from '@teambit/ui-foundation.ui.side-bar';\nimport type { PayloadType } from '@teambit/ui-foundation.ui.side-bar';\nimport { useLanes as defaultUseLanesHook } from '@teambit/lanes.hooks.use-lanes';\nimport { useLaneComponents } from '@teambit/lanes.hooks.use-lane-components';\nimport { TreeNodeProps } from '@teambit/design.ui.tree';\nimport { ComponentModel } from '@teambit/component';\nimport { LanesModel } from '@teambit/lanes.ui.models.lanes-model';\nimport { SidebarWidgetSlot } from './workspace.ui.runtime';\nimport { WorkspaceContext } from './ui/workspace/workspace-context';\n\nexport type WorkspaceDrawerProps = {\n  treeWidgets: SidebarWidgetSlot;\n  filtersSlot: ComponentFiltersSlot;\n  drawerWidgetSlot: DrawerWidgetSlot;\n  overrideUseLanes?: () => { lanesModel?: LanesModel; loading?: boolean };\n};\n\nexport const workspaceDrawer = ({\n  treeWidgets,\n  filtersSlot,\n  drawerWidgetSlot,\n  overrideUseLanes: useLanesFromProps,\n}: WorkspaceDrawerProps) => {\n  const useLanes = useLanesFromProps || defaultUseLanesHook;\n\n  return new ComponentsDrawer({\n    order: 0,\n    id: 'workspace-components-drawer',\n    name: 'COMPONENTS',\n    plugins: {\n      tree: {\n        widgets: treeWidgets,\n        customRenderer: (treeNodeSlot) =>\n          function TreeNode(props: TreeNodeProps<PayloadType>) {\n            const children = props.node.children;\n\n            if (!children) {\n              // non collapse\n              return (\n                <ComponentView\n                  {...props}\n                  treeNodeSlot={treeNodeSlot}\n                  /**\n                   * this is a hack to get around incompatible component id b/w the new sidebar and components in this workspace\n                   * the new sidebar has been tagged with the new LanesModel component which has been upgraded to a new major component id version\n                   * which makes it incompatible with all other components in this workspace\n                   *\n                   * hopefully when wave gets released it becomes seamless to update all dependents for a given version\n                   */\n                  useLanes={useLanes as any}\n                />\n              );\n            }\n\n            if (props.node.payload instanceof ScopePayload) return <ScopeTreeNode {...props} />;\n\n            return <NamespaceTreeNode {...props} />;\n          },\n      },\n      filters: filtersSlot,\n      drawerWidgets: drawerWidgetSlot,\n    },\n    emptyMessage: 'Workspace is empty',\n    useLanes,\n    useComponents: () => {\n      const { lanesModel, loading: lanesLoading } = useLanes();\n\n      const viewedLaneId = lanesModel?.viewedLane?.id;\n      const defaultLane = lanesModel?.getDefaultLane();\n      const isViewingDefaultLane = viewedLaneId && defaultLane?.id.isEqual(viewedLaneId);\n\n      const isViewingWorkspaceVersions = lanesModel?.isViewingCurrentLane();\n\n      const { components: laneComponents = [], loading: laneCompsLoading } = useLaneComponents(\n        !isViewingWorkspaceVersions ? viewedLaneId : undefined\n      );\n\n      const { components: mainComponents = [], loading: mainCompsLoading } = useLaneComponents(defaultLane?.id);\n\n      const workspace = useContext(WorkspaceContext);\n      const { components: workspaceComponents } = workspace;\n\n      const loading = lanesLoading || laneCompsLoading || mainCompsLoading;\n\n      /**\n       * if viewing locally checked out lane, return all components from the workspace\n       * when viewing main when locally checked out to another lane, explicitly return components from the \"main\" lane\n       * when viewing another lane when locally checked out to a different lane, return \"main\" + \"lane\" components\n       * */\n      if (isViewingWorkspaceVersions) {\n        return {\n          loading,\n          components: workspaceComponents,\n        };\n      }\n\n      if (isViewingDefaultLane) {\n        return {\n          loading,\n          components: mainComponents,\n        };\n      }\n\n      return {\n        loading,\n        components: mergeComponents(mainComponents, laneComponents),\n      };\n    },\n  });\n};\n\nfunction mergeComponents(mainComponents: ComponentModel[], laneComponents: ComponentModel[]): ComponentModel[] {\n  const mainComponentsThatAreNotOnLane = mainComponents.filter((mainComponent) => {\n    return !laneComponents.find(\n      (laneComponent) => laneComponent.id.toStringWithoutVersion() === mainComponent.id.toStringWithoutVersion()\n    );\n  });\n  return laneComponents.concat(mainComponentsThatAreNotOnLane);\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","data","_interopRequireWildcard","require","_componentUi","_uiFoundationUi","_lanesHooks","_lanesHooks2","_workspaceContext","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","_extends","assign","bind","arguments","length","apply","workspaceDrawer","treeWidgets","filtersSlot","drawerWidgetSlot","overrideUseLanes","useLanesFromProps","useLanes","defaultUseLanesHook","ComponentsDrawer","order","id","name","plugins","tree","widgets","customRenderer","treeNodeSlot","TreeNode","props","children","node","createElement","ComponentView","payload","ScopePayload","ScopeTreeNode","NamespaceTreeNode","filters","drawerWidgets","emptyMessage","useComponents","lanesModel","loading","lanesLoading","viewedLaneId","viewedLane","defaultLane","getDefaultLane","isViewingDefaultLane","isEqual","isViewingWorkspaceVersions","isViewingCurrentLane","components","laneComponents","laneCompsLoading","useLaneComponents","undefined","mainComponents","mainCompsLoading","workspace","useContext","WorkspaceContext","workspaceComponents","mergeComponents","exports","mainComponentsThatAreNotOnLane","filter","mainComponent","find","laneComponent","toStringWithoutVersion","concat"],"sources":["workspace.ui.drawer.tsx"],"sourcesContent":["import React, { useContext } from 'react';\nimport { ComponentsDrawer, ComponentFiltersSlot, DrawerWidgetSlot } from '@teambit/component.ui.component-drawer';\nimport { ComponentView, NamespaceTreeNode, ScopePayload, ScopeTreeNode } from '@teambit/ui-foundation.ui.side-bar';\nimport type { PayloadType } from '@teambit/ui-foundation.ui.side-bar';\nimport { useLanes as defaultUseLanesHook } from '@teambit/lanes.hooks.use-lanes';\nimport { useLaneComponents } from '@teambit/lanes.hooks.use-lane-components';\nimport { TreeNodeProps } from '@teambit/design.ui.tree';\nimport { ComponentModel } from '@teambit/component';\nimport { LanesModel } from '@teambit/lanes.ui.models.lanes-model';\nimport { SidebarWidgetSlot } from './workspace.ui.runtime';\nimport { WorkspaceContext } from './ui/workspace/workspace-context';\n\nexport type WorkspaceDrawerProps = {\n  treeWidgets: SidebarWidgetSlot;\n  filtersSlot: ComponentFiltersSlot;\n  drawerWidgetSlot: DrawerWidgetSlot;\n  overrideUseLanes?: () => { lanesModel?: LanesModel; loading?: boolean };\n};\n\nexport const workspaceDrawer = ({\n  treeWidgets,\n  filtersSlot,\n  drawerWidgetSlot,\n  overrideUseLanes: useLanesFromProps,\n}: WorkspaceDrawerProps) => {\n  const useLanes = useLanesFromProps || defaultUseLanesHook;\n\n  return new ComponentsDrawer({\n    order: 0,\n    id: 'workspace-components-drawer',\n    name: 'COMPONENTS',\n    plugins: {\n      tree: {\n        widgets: treeWidgets,\n        customRenderer: (treeNodeSlot) =>\n          function TreeNode(props: TreeNodeProps<PayloadType>) {\n            const children = props.node.children;\n\n            if (!children) {\n              // non collapse\n              return <ComponentView {...props} treeNodeSlot={treeNodeSlot} />;\n            }\n\n            if (props.node.payload instanceof ScopePayload) return <ScopeTreeNode {...props} />;\n\n            return <NamespaceTreeNode {...props} />;\n          },\n      },\n      filters: filtersSlot,\n      drawerWidgets: drawerWidgetSlot,\n    },\n    emptyMessage: 'Workspace is empty',\n    useLanes,\n    useComponents: () => {\n      const { lanesModel, loading: lanesLoading } = useLanes();\n\n      const viewedLaneId = lanesModel?.viewedLane?.id;\n      const defaultLane = lanesModel?.getDefaultLane();\n      const isViewingDefaultLane = viewedLaneId && defaultLane?.id.isEqual(viewedLaneId);\n\n      const isViewingWorkspaceVersions = lanesModel?.isViewingCurrentLane();\n\n      const { components: laneComponents = [], loading: laneCompsLoading } = useLaneComponents(\n        !isViewingWorkspaceVersions ? viewedLaneId : undefined\n      );\n\n      const { components: mainComponents = [], loading: mainCompsLoading } = useLaneComponents(defaultLane?.id);\n\n      const workspace = useContext(WorkspaceContext);\n      const { components: workspaceComponents } = workspace;\n\n      const loading = lanesLoading || laneCompsLoading || mainCompsLoading;\n\n      /**\n       * if viewing locally checked out lane, return all components from the workspace\n       * when viewing main when locally checked out to another lane, explicitly return components from the \"main\" lane\n       * when viewing another lane when locally checked out to a different lane, return \"main\" + \"lane\" components\n       * */\n      if (isViewingWorkspaceVersions) {\n        return {\n          loading,\n          components: workspaceComponents,\n        };\n      }\n\n      if (isViewingDefaultLane) {\n        return {\n          loading,\n          components: mainComponents,\n        };\n      }\n\n      return {\n        loading,\n        components: mergeComponents(mainComponents, laneComponents),\n      };\n    },\n  });\n};\n\nfunction mergeComponents(mainComponents: ComponentModel[], laneComponents: ComponentModel[]): ComponentModel[] {\n  const mainComponentsThatAreNotOnLane = mainComponents.filter((mainComponent) => {\n    return !laneComponents.find(\n      (laneComponent) => laneComponent.id.toStringWithoutVersion() === mainComponent.id.toStringWithoutVersion()\n    );\n  });\n  return laneComponents.concat(mainComponentsThatAreNotOnLane);\n}\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/workspace",
-  "version": "1.0.420",
+  "version": "1.0.422",
   "homepage": "https://bit.cloud/teambit/workspace/workspace",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.workspace",
     "name": "workspace",
-    "version": "1.0.420"
+    "version": "1.0.422"
   },
   "dependencies": {
     "lodash": "4.17.21",
@@ -35,7 +35,6 @@
     "@teambit/legacy-bit-id": "1.1.1",
     "@teambit/design.ui.tree": "0.0.15",
     "@teambit/lanes.ui.models.lanes-model": "0.0.221",
-    "@teambit/ui-foundation.ui.side-bar": "0.0.884",
     "@teambit/design.ui.surfaces.menu.link-item": "1.0.0",
     "@teambit/ui-foundation.ui.main-dropdown": "0.0.502",
     "@teambit/ui-foundation.ui.menu": "0.0.502",
@@ -52,32 +51,32 @@
     "@teambit/explorer.ui.gallery.component-grid": "0.0.496",
     "@teambit/scopes.scope-id": "0.0.7",
     "@teambit/workspace.ui.empty-workspace": "0.0.508",
-    "@teambit/component": "1.0.420",
-    "@teambit/dependency-resolver": "1.0.420",
-    "@teambit/envs": "1.0.420",
+    "@teambit/component": "1.0.422",
+    "@teambit/dependency-resolver": "1.0.422",
+    "@teambit/envs": "1.0.422",
     "@teambit/legacy.bit-map": "0.0.37",
     "@teambit/toolbox.fs.last-modified": "0.0.1",
     "@teambit/toolbox.path.path": "0.0.4",
-    "@teambit/logger": "0.0.1090",
-    "@teambit/scope": "1.0.420",
-    "@teambit/graph": "1.0.420",
-    "@teambit/cli": "0.0.997",
-    "@teambit/isolator": "1.0.420",
-    "@teambit/component-tree": "1.0.420",
+    "@teambit/logger": "0.0.1092",
+    "@teambit/scope": "1.0.422",
+    "@teambit/graph": "1.0.422",
+    "@teambit/cli": "0.0.999",
+    "@teambit/isolator": "1.0.422",
+    "@teambit/component-tree": "1.0.422",
     "@teambit/harmony.modules.resolved-component": "0.0.497",
     "@teambit/legacy.utils": "0.0.6",
-    "@teambit/watcher": "1.0.420",
-    "@teambit/aspect-loader": "1.0.420",
-    "@teambit/config": "0.0.1171",
-    "@teambit/global-config": "0.0.1000",
+    "@teambit/watcher": "1.0.422",
+    "@teambit/aspect-loader": "1.0.422",
+    "@teambit/config": "0.0.1173",
+    "@teambit/global-config": "0.0.1002",
     "@teambit/harmony.modules.requireable-component": "0.0.497",
     "@teambit/toolbox.modules.module-resolver": "0.0.7",
     "@teambit/workspace.modules.node-modules-linker": "0.0.208",
-    "@teambit/graphql": "1.0.420",
-    "@teambit/bundler": "1.0.420",
-    "@teambit/pubsub": "1.0.420",
-    "@teambit/ui": "1.0.420",
-    "@teambit/variants": "0.0.1264",
+    "@teambit/graphql": "1.0.422",
+    "@teambit/bundler": "1.0.422",
+    "@teambit/pubsub": "1.0.422",
+    "@teambit/ui": "1.0.422",
+    "@teambit/variants": "0.0.1266",
     "@teambit/component-issues": "0.0.151",
     "@teambit/component.sources": "0.0.33",
     "@teambit/harmony.modules.in-memory-cache": "0.0.2",
@@ -85,20 +84,21 @@
     "@teambit/legacy.scope-api": "0.0.36",
     "@teambit/toolbox.path.is-path-inside": "0.0.496",
     "@teambit/workspace.modules.match-pattern": "0.0.505",
-    "@teambit/component.ui.component-drawer": "0.0.413",
+    "@teambit/component.ui.component-drawer": "0.0.414",
     "@teambit/lanes.hooks.use-lane-components": "0.0.269",
-    "@teambit/lanes.hooks.use-lanes": "0.0.273",
-    "@teambit/command-bar": "1.0.420",
-    "@teambit/component.ui.component-filters.component-filter-context": "0.0.228",
-    "@teambit/component.ui.component-filters.deprecate-filter": "0.0.226",
-    "@teambit/component.ui.component-filters.env-filter": "0.0.238",
-    "@teambit/component.ui.component-filters.show-main-filter": "0.0.219",
-    "@teambit/sidebar": "1.0.420",
-    "@teambit/ui-foundation.ui.react-router.slot-router": "0.0.510",
+    "@teambit/lanes.hooks.use-lanes": "0.0.274",
+    "@teambit/ui-foundation.ui.side-bar": "0.0.886",
+    "@teambit/command-bar": "1.0.422",
+    "@teambit/component.ui.component-filters.component-filter-context": "0.0.229",
+    "@teambit/component.ui.component-filters.deprecate-filter": "0.0.227",
+    "@teambit/component.ui.component-filters.env-filter": "0.0.239",
+    "@teambit/component.ui.component-filters.show-main-filter": "0.0.220",
+    "@teambit/sidebar": "1.0.422",
+    "@teambit/ui-foundation.ui.react-router.slot-router": "0.0.511",
     "@teambit/harmony.modules.concurrency": "0.0.1",
     "@teambit/toolbox.promise.map-pool": "0.0.1",
     "@teambit/component-descriptor": "0.0.426",
-    "@teambit/deprecation": "1.0.420",
+    "@teambit/deprecation": "1.0.422",
     "@teambit/ui-foundation.ui.buttons.collapser": "0.0.223",
     "@teambit/cloud.hooks.use-cloud-scopes": "0.0.3",
     "@teambit/design.ui.tooltip": "0.0.371",

package/workspace.ui.drawer.tsx

@@ -38,20 +38,7 @@ export const workspaceDrawer = ({
 
             if (!children) {
               // non collapse
-              return (
-                <ComponentView
-                  {...props}
-                  treeNodeSlot={treeNodeSlot}
-                  /**
-                   * this is a hack to get around incompatible component id b/w the new sidebar and components in this workspace
-                   * the new sidebar has been tagged with the new LanesModel component which has been upgraded to a new major component id version
-                   * which makes it incompatible with all other components in this workspace
-                   *
-                   * hopefully when wave gets released it becomes seamless to update all dependents for a given version
-                   */
-                  useLanes={useLanes as any}
-                />
-              );
+              return <ComponentView {...props} treeNodeSlot={treeNodeSlot} />;
             }
 
             if (props.node.payload instanceof ScopePayload) return <ScopeTreeNode {...props} />;