@teambit/workspace 0.0.1004 → 0.0.1008

package/dist/{preview-1677814515640.js → preview-1678073766935.js}

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

package/dist/workspace.ui.drawer.js

@@ -108,12 +108,28 @@ const workspaceDrawer = ({
       const {
         components: workspaceComponents
       } = workspace;
+      const loading = lanesLoading || laneCompsLoading || mainCompsLoading;
 
-      // lane components + main components
-      const components = isViewingDefaultLane ? laneComponents : !isViewingWorkspaceVersions && mergeComponents(mainComponents, laneComponents) || workspaceComponents;
+      /**
+       * if viewing locally checked out lane, return all components from the workspace
+       * when viewing main when locally checked out to another lane, explicitly return components from the "main" lane
+       * when viewing another lane when locally checked out to a different lane, return "main" + "lane" components
+       * */
+      if (isViewingWorkspaceVersions) {
+        return {
+          loading,
+          components: workspaceComponents
+        };
+      }
+      if (isViewingDefaultLane) {
+        return {
+          loading,
+          components: mainComponents
+        };
+      }
       return {
-        loading: lanesLoading || laneCompsLoading || mainCompsLoading,
-        components
+        loading,
+        components: mergeComponents(mainComponents, laneComponents)
       };
     }
   });

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

@@ -1 +1 @@
-{"version":3,"names":["workspaceDrawer","treeWidgets","filtersSlot","drawerWidgetSlot","overrideUseLanes","useLanesFromProps","useLanes","defaultUseLanesHook","ComponentsDrawer","order","id","name","plugins","tree","widgets","customRenderer","treeNodeSlot","TreeNode","props","children","node","payload","ScopePayload","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","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 {\n  ComponentView,\n  NamespaceTreeNode,\n  PayloadType,\n  ScopePayload,\n  ScopeTreeNode,\n} 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) return <ComponentView {...props} treeNodeSlot={treeNodeSlot} useLanes={useLanes} />; // non collapse\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      const isViewingWorkspaceVersions = lanesModel?.isViewingCurrentLane();\n\n      const { components: laneComponents = [], loading: laneCompsLoading } = useLaneComponents(\n        !isViewingWorkspaceVersions ? viewedLaneId : undefined\n      );\n      const { components: mainComponents = [], loading: mainCompsLoading } = useLaneComponents(\n        !isViewingDefaultLane ? defaultLane?.id : undefined\n      );\n      const workspace = useContext(WorkspaceContext);\n      const { components: workspaceComponents } = workspace;\n\n      // lane components + main components\n      const components = isViewingDefaultLane\n        ? laneComponents\n        : (!isViewingWorkspaceVersions && mergeComponents(mainComponents, laneComponents)) || workspaceComponents;\n\n      return {\n        loading: lanesLoading || laneCompsLoading || mainCompsLoading,\n        components,\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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"}
+{"version":3,"names":["workspaceDrawer","treeWidgets","filtersSlot","drawerWidgetSlot","overrideUseLanes","useLanesFromProps","useLanes","defaultUseLanesHook","ComponentsDrawer","order","id","name","plugins","tree","widgets","customRenderer","treeNodeSlot","TreeNode","props","children","node","payload","ScopePayload","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","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 {\n  ComponentView,\n  NamespaceTreeNode,\n  PayloadType,\n  ScopePayload,\n  ScopeTreeNode,\n} 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) return <ComponentView {...props} treeNodeSlot={treeNodeSlot} useLanes={useLanes} />; // non collapse\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      const { components: mainComponents = [], loading: mainCompsLoading } = useLaneComponents(\n        !isViewingDefaultLane ? defaultLane?.id : undefined\n      );\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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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/workspace",
-  "version": "0.0.1004",
+  "version": "0.0.1008",
   "homepage": "https://bit.dev/teambit/workspace/workspace",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.workspace",
     "name": "workspace",
-    "version": "0.0.1004"
+    "version": "0.0.1008"
   },
   "dependencies": {
     "lodash": "4.17.21",
@@ -31,54 +31,54 @@
     "@teambit/design.ui.surfaces.menu.link-item": "1.0.0",
     "@teambit/base-ui.surfaces.split-pane.hover-splitter": "1.0.0",
     "@teambit/base-ui.surfaces.split-pane.split-pane": "1.0.0",
-    "@teambit/component": "0.0.1004",
-    "@teambit/dependency-resolver": "0.0.1004",
-    "@teambit/envs": "0.0.1004",
+    "@teambit/component": "0.0.1008",
+    "@teambit/dependency-resolver": "0.0.1008",
+    "@teambit/envs": "0.0.1008",
     "@teambit/legacy-bit-id": "0.0.423",
     "@teambit/bit-error": "0.0.402",
     "@teambit/component-id": "0.0.427",
-    "@teambit/lane-id": "0.0.192",
-    "@teambit/logger": "0.0.768",
-    "@teambit/scope": "0.0.1004",
-    "@teambit/graph": "0.0.1004",
-    "@teambit/cli": "0.0.675",
-    "@teambit/isolator": "0.0.1004",
-    "@teambit/component-tree": "0.0.792",
+    "@teambit/lane-id": "0.0.194",
+    "@teambit/logger": "0.0.770",
+    "@teambit/scope": "0.0.1008",
+    "@teambit/graph": "0.0.1008",
+    "@teambit/cli": "0.0.677",
+    "@teambit/isolator": "0.0.1008",
+    "@teambit/component-tree": "0.0.796",
     "@teambit/component.ui.component-status-resolver": "0.0.505",
     "@teambit/harmony.modules.resolved-component": "0.0.491",
-    "@teambit/compiler": "0.0.1004",
-    "@teambit/aspect-loader": "0.0.1004",
-    "@teambit/config": "0.0.688",
+    "@teambit/compiler": "0.0.1008",
+    "@teambit/aspect-loader": "0.0.1008",
+    "@teambit/config": "0.0.690",
     "@teambit/harmony.modules.requireable-component": "0.0.491",
     "@teambit/toolbox.modules.module-resolver": "0.0.1",
-    "@teambit/workspace.modules.node-modules-linker": "0.0.19",
-    "@teambit/graphql": "0.0.1004",
-    "@teambit/bundler": "0.0.1004",
-    "@teambit/pubsub": "0.0.1004",
-    "@teambit/ui": "0.0.1004",
-    "@teambit/variants": "0.0.780",
+    "@teambit/workspace.modules.node-modules-linker": "0.0.21",
+    "@teambit/graphql": "0.0.1008",
+    "@teambit/bundler": "0.0.1008",
+    "@teambit/pubsub": "0.0.1008",
+    "@teambit/ui": "0.0.1008",
+    "@teambit/variants": "0.0.782",
     "@teambit/component-issues": "0.0.88",
     "@teambit/component-version": "0.0.408",
     "@teambit/workspace.modules.match-pattern": "0.0.498",
-    "@teambit/component.ui.component-drawer": "0.0.233",
+    "@teambit/component.ui.component-drawer": "0.0.235",
     "@teambit/design.ui.tree": "0.0.16",
-    "@teambit/lanes.hooks.use-lane-components": "0.0.137",
-    "@teambit/lanes.hooks.use-lanes": "0.0.138",
-    "@teambit/lanes.ui.models.lanes-model": "0.0.100",
-    "@teambit/ui-foundation.ui.side-bar": "0.0.750",
-    "@teambit/command-bar": "0.0.1004",
-    "@teambit/component.ui.component-filters.component-filter-context": "0.0.107",
-    "@teambit/component.ui.component-filters.deprecate-filter": "0.0.107",
-    "@teambit/component.ui.component-filters.env-filter": "0.0.113",
-    "@teambit/component.ui.component-filters.show-main-filter": "0.0.100",
-    "@teambit/sidebar": "0.0.1004",
+    "@teambit/lanes.hooks.use-lane-components": "0.0.139",
+    "@teambit/lanes.hooks.use-lanes": "0.0.140",
+    "@teambit/lanes.ui.models.lanes-model": "0.0.102",
+    "@teambit/ui-foundation.ui.side-bar": "0.0.752",
+    "@teambit/command-bar": "0.0.1008",
+    "@teambit/component.ui.component-filters.component-filter-context": "0.0.109",
+    "@teambit/component.ui.component-filters.deprecate-filter": "0.0.109",
+    "@teambit/component.ui.component-filters.env-filter": "0.0.115",
+    "@teambit/component.ui.component-filters.show-main-filter": "0.0.102",
+    "@teambit/sidebar": "0.0.1008",
     "@teambit/ui-foundation.ui.main-dropdown": "0.0.497",
     "@teambit/ui-foundation.ui.menu": "0.0.497",
     "@teambit/ui-foundation.ui.react-router.slot-router": "0.0.501",
     "@teambit/ui-foundation.ui.tree.drawer": "0.0.511",
     "@teambit/ui-foundation.ui.hooks.use-data-query": "0.0.500",
-    "@teambit/component-descriptor": "0.0.244",
-    "@teambit/deprecation": "0.0.1004",
+    "@teambit/component-descriptor": "0.0.246",
+    "@teambit/deprecation": "0.0.1008",
     "@teambit/ui-foundation.ui.constants.z-indexes": "0.0.498",
     "@teambit/ui-foundation.ui.buttons.collapser": "0.0.206",
     "@teambit/ui-foundation.ui.corner": "0.0.508",
@@ -106,7 +106,7 @@
   "peerDependencies": {
     "react-router-dom": "^6.0.0",
     "@apollo/client": "^3.6.0",
-    "@teambit/legacy": "1.0.455",
+    "@teambit/legacy": "1.0.456",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },

package/workspace.ui.drawer.tsx

@@ -59,6 +59,7 @@ export const workspaceDrawer = ({
       const viewedLaneId = lanesModel?.viewedLane?.id;
       const defaultLane = lanesModel?.getDefaultLane();
       const isViewingDefaultLane = viewedLaneId && defaultLane?.id.isEqual(viewedLaneId);
+
       const isViewingWorkspaceVersions = lanesModel?.isViewingCurrentLane();
 
       const { components: laneComponents = [], loading: laneCompsLoading } = useLaneComponents(
@@ -67,17 +68,34 @@ export const workspaceDrawer = ({
       const { components: mainComponents = [], loading: mainCompsLoading } = useLaneComponents(
         !isViewingDefaultLane ? defaultLane?.id : undefined
       );
+
       const workspace = useContext(WorkspaceContext);
       const { components: workspaceComponents } = workspace;
 
-      // lane components + main components
-      const components = isViewingDefaultLane
-        ? laneComponents
-        : (!isViewingWorkspaceVersions && mergeComponents(mainComponents, laneComponents)) || workspaceComponents;
+      const loading = lanesLoading || laneCompsLoading || mainCompsLoading;
+
+      /**
+       * if viewing locally checked out lane, return all components from the workspace
+       * when viewing main when locally checked out to another lane, explicitly return components from the "main" lane
+       * when viewing another lane when locally checked out to a different lane, return "main" + "lane" components
+       * */
+      if (isViewingWorkspaceVersions) {
+        return {
+          loading,
+          components: workspaceComponents,
+        };
+      }
+
+      if (isViewingDefaultLane) {
+        return {
+          loading,
+          components: mainComponents,
+        };
+      }
 
       return {
-        loading: lanesLoading || laneCompsLoading || mainCompsLoading,
-        components,
+        loading,
+        components: mergeComponents(mainComponents, laneComponents),
       };
     },
   });