@teambit/workspace 0.0.998 → 0.0.999

package/component-tree.widget.tsx

@@ -1,22 +1,9 @@
+import React from 'react';
 import { ComponentTreeNode, ComponentTreeNodeProps } from '@teambit/component-tree';
 import { ComponentStatusResolver } from '@teambit/component.ui.component-status-resolver';
-import { useLanes } from '@teambit/lanes.hooks.use-lanes';
-import React, { useMemo } from 'react';
 
 export class ComponentTreeWidget implements ComponentTreeNode {
   widget = ({ component }: ComponentTreeNodeProps) => {
-    const { lanesModel } = useLanes();
-
-    const isInCurrentLane = useMemo(() => {
-      return component.id && lanesModel?.isComponentOnLaneButNotOnMain(component.id);
-    }, [lanesModel?.viewedLane, component.id]);
-
-    return (
-      <ComponentStatusResolver
-        status={component.status}
-        issuesCount={component.issuesCount}
-        isInCurrentLane={isInCurrentLane}
-      />
-    );
+    return <ComponentStatusResolver status={component.status} issuesCount={component.issuesCount} />;
   };
 }

package/dist/aspects-merger.js

@@ -140,7 +140,7 @@ class AspectsMerger {
     this.removeAutoDepsFromConfig(componentId, configMergeExtensions);
     const scopeExtensions = (componentFromScope === null || componentFromScope === void 0 ? void 0 : (_componentFromScope$c = componentFromScope.config) === null || _componentFromScope$c === void 0 ? void 0 : _componentFromScope$c.extensions) || new (_extensionData().ExtensionDataList)();
     // backward compatibility. previously, it was saved as an array into the model (when there was merge-config)
-    this.removeAutoDepsFromConfig(componentId, scopeExtensions);
+    this.removeAutoDepsFromConfig(componentId, scopeExtensions, true);
     const [specific, nonSpecific] = (0, _lodash().partition)(scopeExtensions, entry => entry.config[_workspace().AspectSpecificField] === true);
     const scopeExtensionsNonSpecific = new (_extensionData().ExtensionDataList)(...nonSpecific);
     const scopeExtensionsSpecific = new (_extensionData().ExtensionDataList)(...specific);
@@ -252,7 +252,7 @@ class AspectsMerger {
    * 1. force: true, which gets saved into the config.
    * 2. force: false, which gets saved into the data.dependencies later on. see the LegacyDependencyResolver.registerOnComponentAutoDetectOverridesGetter hook
    */
-  removeAutoDepsFromConfig(componentId, conf) {
+  removeAutoDepsFromConfig(componentId, conf, fromScope = false) {
     var _conf$findCoreExtensi;
     if (!conf) return;
     const policy = (_conf$findCoreExtensi = conf.findCoreExtension(_dependencyResolver().DependencyResolverAspect.id)) === null || _conf$findCoreExtensi === void 0 ? void 0 : _conf$findCoreExtensi.config.policy;
@@ -274,10 +274,12 @@ class AspectsMerger {
         return acc;
       }, {});
     });
-    if (!this.mergeConfigDepsResolverDataCache[componentId.toString()]) {
-      this.mergeConfigDepsResolverDataCache[componentId.toString()] = {};
+    if (!fromScope) {
+      if (!this.mergeConfigDepsResolverDataCache[componentId.toString()]) {
+        this.mergeConfigDepsResolverDataCache[componentId.toString()] = {};
+      }
+      this.mergeConfigDepsResolverDataCache[componentId.toString()] = (0, _lodash().merge)(this.mergeConfigDepsResolverDataCache[componentId.toString()], mergeConfigObj);
     }
-    this.mergeConfigDepsResolverDataCache[componentId.toString()] = (0, _lodash().merge)(this.mergeConfigDepsResolverDataCache[componentId.toString()], mergeConfigObj);
   }
   getUnmergedData(componentId) {
     return this.workspace.scope.legacyScope.objects.unmergedComponents.getEntry(componentId._legacy.name);

package/dist/aspects-merger.js.map

@@ -1 +1 @@
-{"version":3,"names":["AspectsMerger","constructor","workspace","harmony","consumer","mergeConflictFile","MergeConflictFile","path","getDepsDataOfMergeConfig","id","mergeConfigDepsResolverDataCache","toString","merge","componentId","componentFromScope","excludeOrigins","configFileExtensions","variantsExtensions","wsDefaultExtensions","mergeFromScope","errors","bitMapEntry","bitMap","getComponentIfExist","_legacy","bitMapExtensions","config","configMerge","getConflictParsed","toStringWithoutVersion","err","MergeConfigConflict","logger","error","push","adjustEnvsOnConfigMerge","conf","env","EnvsAspect","split","unmergedData","getUnmergedData","unmergedDataMergeConf","mergedConfig","getMergeConfigCombined","undefined","mergeWith","objValue","srcValue","Array","isArray","concat","mergeConfigCombined","configMergeExtensions","ExtensionDataList","fromConfigObject","removeAutoDepsFromConfig","scopeExtensions","extensions","specific","nonSpecific","partition","entry","AspectSpecificField","scopeExtensionsNonSpecific","scopeExtensionsSpecific","componentConfigFile","aspects","toLegacy","relativeComponentDir","componentDir","ignoreVersion","relative","variantConfig","variants","byRootDirAndName","fullName","clone","extensionsToMerge","envWasFoundPreviously","removedExtensionIds","addExtensionsToMerge","origin","extraData","length","filter","extData","isRemoved","map","stringId","extsWithoutRemoved","filterRemovedExtensions","selfInMergedExtensions","findExtension","toStringWithoutScopeAndVersion","extsWithoutSelf","extensionId","remove","extensionDataListFiltered","envIsCurrentlySet","filterEnvsFromExtensionsIfNeeded","warnAboutMisconfiguredEnv","setDataListAsSpecific","forEach","dataEntry","includes","extensionDataList","fromArray","continuePropagating","propagate","appliedRules","sortedMatches","pattern","specificity","isDefaultExtension","Promise","all","list","resolveExtensionListIds","afterMerge","mergeConfigs","ext","loadExtensions","withoutRemoved","beforeMerge","policy","findCoreExtension","DependencyResolverAspect","mergeConfigObj","key","dep","force","reduce","acc","current","name","version","scope","legacyScope","objects","unmergedComponents","getEntry","hasId","envAspect","envFromEnvsAspect","envs","getCoreEnvsIds","warnedAboutMisconfiguredEnvs","envId","resolveComponentId","get","isUsingEnvEnv","consoleWarning","data","nonEnvs","e","envAspectExt","find","ids","listIds","envAspectId","found","isEqualWithoutVersion","Boolean","originatedFrom","throwOnError","extensionsIdsP","extensionEntry","extensionsIds","loadedExtensions","extensionsToLoad","difference","loadAspects","extensionList","promises"],"sources":["aspects-merger.ts"],"sourcesContent":["import { Harmony } from '@teambit/harmony';\nimport { Component, ComponentID } from '@teambit/component';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { EnvsAspect } from '@teambit/envs';\nimport { DependencyResolverAspect } from '@teambit/dependency-resolver';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport { partition, mergeWith, difference, merge } from 'lodash';\nimport { MergeConfigConflict } from './exceptions/merge-config-conflict';\nimport { AspectSpecificField, ExtensionsOrigin, Workspace } from './workspace';\nimport { MergeConflictFile } from './merge-conflict-file';\n\nexport class AspectsMerger {\n  private consumer: Consumer;\n  private warnedAboutMisconfiguredEnvs: string[] = []; // cache env-ids that have been errored about not having \"env\" type\n  readonly mergeConflictFile: MergeConflictFile;\n  private mergeConfigDepsResolverDataCache: { [compIdStr: string]: Record<string, any> } = {};\n  constructor(private workspace: Workspace, private harmony: Harmony) {\n    this.consumer = workspace.consumer;\n    this.mergeConflictFile = new MergeConflictFile(workspace.path);\n  }\n\n  getDepsDataOfMergeConfig(id: BitId) {\n    return this.mergeConfigDepsResolverDataCache[id.toString()];\n  }\n\n  /**\n   * Calculate the component config based on:\n   * the config property in the .bitmap file\n   * the component.json file in the component folder\n   * matching pattern in the variants config\n   * defaults extensions from workspace config\n   * extensions from the model.\n   */\n  // eslint-disable-next-line complexity\n  async merge(\n    componentId: ComponentID,\n    componentFromScope?: Component,\n    excludeOrigins: ExtensionsOrigin[] = []\n  ): Promise<{\n    extensions: ExtensionDataList;\n    beforeMerge: Array<{ extensions: ExtensionDataList; origin: ExtensionsOrigin; extraData: any }>; // useful for debugging\n    errors?: Error[];\n  }> {\n    // TODO: consider caching this result\n    let configFileExtensions: ExtensionDataList | undefined;\n    let variantsExtensions: ExtensionDataList | undefined;\n    let wsDefaultExtensions: ExtensionDataList | undefined;\n    const mergeFromScope = true;\n    const errors: Error[] = [];\n\n    const bitMapEntry = this.consumer.bitMap.getComponentIfExist(componentId._legacy);\n    const bitMapExtensions = bitMapEntry?.config;\n\n    let configMerge: Record<string, any> | undefined;\n    try {\n      configMerge = await this.mergeConflictFile.getConflictParsed(componentId.toStringWithoutVersion());\n    } catch (err) {\n      if (!(err instanceof MergeConfigConflict)) {\n        throw err;\n      }\n      this.workspace.logger.error(`unable to parse the config file for ${componentId.toString()} due to conflicts`);\n      errors.push(err);\n    }\n\n    const adjustEnvsOnConfigMerge = (conf: Record<string, any>) => {\n      const env = conf[EnvsAspect.id]?.env;\n      if (!env) return;\n      const [id] = env.split('@');\n      conf[EnvsAspect.id] = { env: id };\n      conf[env] = {};\n    };\n\n    const unmergedData = this.getUnmergedData(componentId);\n    const unmergedDataMergeConf = unmergedData?.mergedConfig;\n    const getMergeConfigCombined = () => {\n      if (!configMerge && !unmergedDataMergeConf) return undefined;\n      if (!configMerge) return unmergedDataMergeConf;\n      if (!unmergedDataMergeConf) return configMerge;\n\n      return mergeWith(configMerge, unmergedDataMergeConf, (objValue, srcValue) => {\n        if (Array.isArray(objValue)) {\n          // critical for dependencyResolver.policy.*dependencies. otherwise, it will override the array\n          return objValue.concat(srcValue);\n        }\n        return undefined;\n      });\n    };\n    const mergeConfigCombined = getMergeConfigCombined();\n    adjustEnvsOnConfigMerge(mergeConfigCombined || {});\n\n    const configMergeExtensions = mergeConfigCombined\n      ? ExtensionDataList.fromConfigObject(mergeConfigCombined)\n      : undefined;\n\n    this.removeAutoDepsFromConfig(componentId, configMergeExtensions);\n    const scopeExtensions = componentFromScope?.config?.extensions || new ExtensionDataList();\n    // backward compatibility. previously, it was saved as an array into the model (when there was merge-config)\n    this.removeAutoDepsFromConfig(componentId, scopeExtensions);\n    const [specific, nonSpecific] = partition(scopeExtensions, (entry) => entry.config[AspectSpecificField] === true);\n    const scopeExtensionsNonSpecific = new ExtensionDataList(...nonSpecific);\n    const scopeExtensionsSpecific = new ExtensionDataList(...specific);\n\n    const componentConfigFile = await this.workspace.componentConfigFile(componentId);\n    if (componentConfigFile) {\n      configFileExtensions = componentConfigFile.aspects.toLegacy();\n    }\n    const relativeComponentDir = this.workspace.componentDir(componentId, { ignoreVersion: true }, { relative: true });\n    const variantConfig = this.workspace.variants.byRootDirAndName(relativeComponentDir, componentId.fullName);\n    if (variantConfig) {\n      variantsExtensions = variantConfig.extensions.clone();\n      // Do not merge from scope when there is specific variant (which is not *) that match the component\n      // if (variantConfig.maxSpecificity > 0) {\n      //   mergeFromScope = false;\n      // }\n    }\n    // We don't stop on each step because we want to merge the default scope even if propagate=false but the default scope is not defined\n    // in the case the same extension pushed twice, the former takes precedence (opposite of Object.assign)\n    const extensionsToMerge: Array<{ origin: ExtensionsOrigin; extensions: ExtensionDataList; extraData: any }> = [];\n    let envWasFoundPreviously = false;\n    const removedExtensionIds: string[] = [];\n\n    const addExtensionsToMerge = async (extensions: ExtensionDataList, origin: ExtensionsOrigin, extraData?: any) => {\n      if (!extensions.length) {\n        return;\n      }\n      removedExtensionIds.push(...extensions.filter((extData) => extData.isRemoved).map((extData) => extData.stringId));\n      const extsWithoutRemoved = extensions.filterRemovedExtensions();\n      const selfInMergedExtensions = extsWithoutRemoved.findExtension(\n        componentId._legacy.toStringWithoutScopeAndVersion(),\n        true,\n        true\n      );\n      const extsWithoutSelf = selfInMergedExtensions?.extensionId\n        ? extsWithoutRemoved.remove(selfInMergedExtensions.extensionId)\n        : extsWithoutRemoved;\n      const { extensionDataListFiltered, envIsCurrentlySet } = await this.filterEnvsFromExtensionsIfNeeded(\n        extsWithoutSelf,\n        envWasFoundPreviously,\n        origin\n      );\n      if (envIsCurrentlySet) {\n        await this.warnAboutMisconfiguredEnv(componentId, extensions);\n        envWasFoundPreviously = true;\n      }\n\n      extensionsToMerge.push({ origin, extensions: extensionDataListFiltered, extraData });\n    };\n    const setDataListAsSpecific = (extensions: ExtensionDataList) => {\n      extensions.forEach((dataEntry) => (dataEntry.config[AspectSpecificField] = true));\n    };\n    if (bitMapExtensions && !excludeOrigins.includes('BitmapFile')) {\n      const extensionDataList = ExtensionDataList.fromConfigObject(bitMapExtensions);\n      setDataListAsSpecific(extensionDataList);\n      await addExtensionsToMerge(extensionDataList, 'BitmapFile');\n    }\n    // config-merge is after the .bitmap. because normally if you have config set in .bitmap, you won't\n    // be able to lane-merge. (unless you specify --ignore-config-changes).\n    // so, if there is config in .bitmap, it probably happened after lane-merge.\n    if (configMergeExtensions && !excludeOrigins.includes('ConfigMerge')) {\n      await addExtensionsToMerge(ExtensionDataList.fromArray(configMergeExtensions), 'ConfigMerge');\n    }\n    if (configFileExtensions && !excludeOrigins.includes('ComponentJsonFile')) {\n      setDataListAsSpecific(configFileExtensions);\n      await addExtensionsToMerge(configFileExtensions, 'ComponentJsonFile');\n    }\n    if (!excludeOrigins.includes('ModelSpecific')) {\n      await addExtensionsToMerge(ExtensionDataList.fromArray(scopeExtensionsSpecific), 'ModelSpecific');\n    }\n    let continuePropagating = componentConfigFile?.propagate ?? true;\n    if (variantsExtensions && continuePropagating && !excludeOrigins.includes('WorkspaceVariants')) {\n      const appliedRules = variantConfig?.sortedMatches.map(({ pattern, specificity }) => ({ pattern, specificity }));\n      await addExtensionsToMerge(variantsExtensions, 'WorkspaceVariants', { appliedRules });\n    }\n    continuePropagating = continuePropagating && (variantConfig?.propagate ?? true);\n    // Do not apply default extensions on the default extensions (it will create infinite loop when loading them)\n    const isDefaultExtension = wsDefaultExtensions?.findExtension(componentId.toString(), true, true);\n    if (\n      wsDefaultExtensions &&\n      continuePropagating &&\n      !isDefaultExtension &&\n      !excludeOrigins.includes('WorkspaceDefault')\n    ) {\n      await addExtensionsToMerge(wsDefaultExtensions, 'WorkspaceDefault');\n    }\n    if (mergeFromScope && continuePropagating && !excludeOrigins.includes('ModelNonSpecific')) {\n      await addExtensionsToMerge(scopeExtensionsNonSpecific, 'ModelNonSpecific');\n    }\n\n    // It's important to do this resolution before the merge, otherwise we have issues with extensions\n    // coming from scope with local scope name, as opposed to the same extension comes from the workspace with default scope name\n    await Promise.all(extensionsToMerge.map((list) => this.resolveExtensionListIds(list.extensions)));\n    const afterMerge = ExtensionDataList.mergeConfigs(extensionsToMerge.map((ext) => ext.extensions));\n    await this.loadExtensions(afterMerge, componentId);\n    const withoutRemoved = afterMerge.filter((extData) => !removedExtensionIds.includes(extData.stringId));\n    const extensions = ExtensionDataList.fromArray(withoutRemoved);\n    return {\n      extensions,\n      beforeMerge: extensionsToMerge,\n      errors,\n    };\n  }\n\n  /**\n   * from the merge-config we get the dep-resolver policy as an array, because it needs to support \"force\" prop.\n   * however, when we save the config, we want to save it as an object, so we need split the data into two:\n   * 1. force: true, which gets saved into the config.\n   * 2. force: false, which gets saved into the data.dependencies later on. see the LegacyDependencyResolver.registerOnComponentAutoDetectOverridesGetter hook\n   */\n  private removeAutoDepsFromConfig(componentId: ComponentID, conf?: ExtensionDataList) {\n    if (!conf) return;\n    const policy = conf.findCoreExtension(DependencyResolverAspect.id)?.config.policy;\n    if (!policy) return;\n\n    const mergeConfigObj = {};\n    ['dependencies', 'devDependencies', 'peerDependencies'].forEach((key) => {\n      if (!policy[key]) return;\n      // this is only relevant when it is saved as an array. otherwise, it's always force: true.\n      if (!Array.isArray(policy[key])) return;\n\n      mergeConfigObj[key] = policy[key].filter((dep) => !dep.force);\n      policy[key] = policy[key].filter((dep) => dep.force);\n\n      if (!policy[key].length) {\n        delete policy[key];\n        return;\n      }\n      // convert to object\n      policy[key] = policy[key].reduce((acc, current) => {\n        acc[current.name] = current.version;\n        return acc;\n      }, {});\n    });\n\n    if (!this.mergeConfigDepsResolverDataCache[componentId.toString()]) {\n      this.mergeConfigDepsResolverDataCache[componentId.toString()] = {};\n    }\n    this.mergeConfigDepsResolverDataCache[componentId.toString()] = merge(\n      this.mergeConfigDepsResolverDataCache[componentId.toString()],\n      mergeConfigObj\n    );\n  }\n\n  private getUnmergedData(componentId: ComponentID): UnmergedComponent | undefined {\n    return this.workspace.scope.legacyScope.objects.unmergedComponents.getEntry(componentId._legacy.name);\n  }\n\n  private async warnAboutMisconfiguredEnv(componentId: ComponentID, extensionDataList: ExtensionDataList) {\n    if (!(await this.workspace.hasId(componentId))) {\n      // if this is a dependency and not belong to the workspace, don't show the warning\n      return;\n    }\n    const envAspect = extensionDataList.findExtension(EnvsAspect.id);\n    const envFromEnvsAspect = envAspect?.config.env;\n    if (!envFromEnvsAspect) return;\n    if (this.workspace.envs.getCoreEnvsIds().includes(envFromEnvsAspect)) return;\n    if (this.warnedAboutMisconfiguredEnvs.includes(envFromEnvsAspect)) return;\n    let env: Component;\n    try {\n      const envId = await this.workspace.resolveComponentId(envFromEnvsAspect);\n      env = await this.workspace.get(envId);\n    } catch (err) {\n      return; // unable to get the component for some reason. don't sweat it. forget about the warning\n    }\n    if (!this.workspace.envs.isUsingEnvEnv(env)) {\n      this.warnedAboutMisconfiguredEnvs.push(envFromEnvsAspect);\n      this.workspace.logger.consoleWarning(\n        `env \"${envFromEnvsAspect}\" is not of type env. (correct the env's type, or component config with \"bit env set ${envFromEnvsAspect} teambit.envs/env\")`\n      );\n    }\n  }\n\n  private async filterEnvsFromExtensionsIfNeeded(\n    extensionDataList: ExtensionDataList,\n    envWasFoundPreviously: boolean,\n    origin: ExtensionsOrigin\n  ) {\n    const envAspect = extensionDataList.findExtension(EnvsAspect.id);\n    const envFromEnvsAspect: string | undefined = envAspect?.config.env || envAspect?.data.id;\n    if (envWasFoundPreviously && envAspect) {\n      const nonEnvs = extensionDataList.filter((e) => {\n        // normally the env-id inside the envs aspect doesn't have a version, but the aspect itself has a version.\n        if (e.stringId === envFromEnvsAspect || e.extensionId?.toStringWithoutVersion() === envFromEnvsAspect)\n          return false;\n        return true;\n      });\n      // still, aspect env may have other data other then config.env.\n      delete envAspect.config.env;\n      return { extensionDataListFiltered: new ExtensionDataList(...nonEnvs), envIsCurrentlySet: true };\n    }\n    if (envFromEnvsAspect && (origin === 'ModelNonSpecific' || origin === 'ModelSpecific')) {\n      // if env was found, search for this env in the workspace and if found, replace the env-id with the one from the workspace\n      const envAspectExt = extensionDataList.find((e) => e.extensionId?.toStringWithoutVersion() === envFromEnvsAspect);\n      const ids = await this.workspace.listIds();\n      const envAspectId = envAspectExt?.extensionId;\n      const found = envAspectId && ids.find((id) => id._legacy.isEqualWithoutVersion(envAspectId));\n      if (found) {\n        envAspectExt.extensionId = found._legacy;\n      }\n    }\n    return { extensionDataListFiltered: extensionDataList, envIsCurrentlySet: Boolean(envFromEnvsAspect) };\n  }\n\n  /**\n   * Load all unloaded extensions from a list\n   * @param extensions list of extensions with config to load\n   */\n  private async loadExtensions(\n    extensions: ExtensionDataList,\n    originatedFrom?: ComponentID,\n    throwOnError = false\n  ): Promise<void> {\n    const extensionsIdsP = extensions.map(async (extensionEntry) => {\n      // Core extension\n      if (!extensionEntry.extensionId) {\n        return extensionEntry.stringId as string;\n      }\n\n      const id = await this.workspace.resolveComponentId(extensionEntry.extensionId);\n      // return this.resolveComponentId(extensionEntry.extensionId);\n      return id.toString();\n    });\n    const extensionsIds: string[] = await Promise.all(extensionsIdsP);\n    const loadedExtensions = this.harmony.extensionsIds;\n    const extensionsToLoad = difference(extensionsIds, loadedExtensions);\n    if (!extensionsToLoad.length) return;\n    await this.workspace.loadAspects(extensionsToLoad, throwOnError, originatedFrom?.toString());\n  }\n\n  /**\n   * This will mutate the entries with extensionId prop to have resolved legacy id\n   * This should be worked on the extension data list not the new aspect list\n   * @param extensionList\n   */\n  private async resolveExtensionListIds(extensionList: ExtensionDataList): Promise<ExtensionDataList> {\n    const promises = extensionList.map(async (entry) => {\n      if (entry.extensionId) {\n        const id = await this.workspace.resolveComponentId(entry.extensionId);\n        entry.extensionId = id._legacy;\n      }\n\n      return entry;\n    });\n    await Promise.all(promises);\n    return extensionList;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["AspectsMerger","constructor","workspace","harmony","consumer","mergeConflictFile","MergeConflictFile","path","getDepsDataOfMergeConfig","id","mergeConfigDepsResolverDataCache","toString","merge","componentId","componentFromScope","excludeOrigins","configFileExtensions","variantsExtensions","wsDefaultExtensions","mergeFromScope","errors","bitMapEntry","bitMap","getComponentIfExist","_legacy","bitMapExtensions","config","configMerge","getConflictParsed","toStringWithoutVersion","err","MergeConfigConflict","logger","error","push","adjustEnvsOnConfigMerge","conf","env","EnvsAspect","split","unmergedData","getUnmergedData","unmergedDataMergeConf","mergedConfig","getMergeConfigCombined","undefined","mergeWith","objValue","srcValue","Array","isArray","concat","mergeConfigCombined","configMergeExtensions","ExtensionDataList","fromConfigObject","removeAutoDepsFromConfig","scopeExtensions","extensions","specific","nonSpecific","partition","entry","AspectSpecificField","scopeExtensionsNonSpecific","scopeExtensionsSpecific","componentConfigFile","aspects","toLegacy","relativeComponentDir","componentDir","ignoreVersion","relative","variantConfig","variants","byRootDirAndName","fullName","clone","extensionsToMerge","envWasFoundPreviously","removedExtensionIds","addExtensionsToMerge","origin","extraData","length","filter","extData","isRemoved","map","stringId","extsWithoutRemoved","filterRemovedExtensions","selfInMergedExtensions","findExtension","toStringWithoutScopeAndVersion","extsWithoutSelf","extensionId","remove","extensionDataListFiltered","envIsCurrentlySet","filterEnvsFromExtensionsIfNeeded","warnAboutMisconfiguredEnv","setDataListAsSpecific","forEach","dataEntry","includes","extensionDataList","fromArray","continuePropagating","propagate","appliedRules","sortedMatches","pattern","specificity","isDefaultExtension","Promise","all","list","resolveExtensionListIds","afterMerge","mergeConfigs","ext","loadExtensions","withoutRemoved","beforeMerge","fromScope","policy","findCoreExtension","DependencyResolverAspect","mergeConfigObj","key","dep","force","reduce","acc","current","name","version","scope","legacyScope","objects","unmergedComponents","getEntry","hasId","envAspect","envFromEnvsAspect","envs","getCoreEnvsIds","warnedAboutMisconfiguredEnvs","envId","resolveComponentId","get","isUsingEnvEnv","consoleWarning","data","nonEnvs","e","envAspectExt","find","ids","listIds","envAspectId","found","isEqualWithoutVersion","Boolean","originatedFrom","throwOnError","extensionsIdsP","extensionEntry","extensionsIds","loadedExtensions","extensionsToLoad","difference","loadAspects","extensionList","promises"],"sources":["aspects-merger.ts"],"sourcesContent":["import { Harmony } from '@teambit/harmony';\nimport { Component, ComponentID } from '@teambit/component';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { EnvsAspect } from '@teambit/envs';\nimport { DependencyResolverAspect } from '@teambit/dependency-resolver';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport { partition, mergeWith, difference, merge } from 'lodash';\nimport { MergeConfigConflict } from './exceptions/merge-config-conflict';\nimport { AspectSpecificField, ExtensionsOrigin, Workspace } from './workspace';\nimport { MergeConflictFile } from './merge-conflict-file';\n\nexport class AspectsMerger {\n  private consumer: Consumer;\n  private warnedAboutMisconfiguredEnvs: string[] = []; // cache env-ids that have been errored about not having \"env\" type\n  readonly mergeConflictFile: MergeConflictFile;\n  private mergeConfigDepsResolverDataCache: { [compIdStr: string]: Record<string, any> } = {};\n  constructor(private workspace: Workspace, private harmony: Harmony) {\n    this.consumer = workspace.consumer;\n    this.mergeConflictFile = new MergeConflictFile(workspace.path);\n  }\n\n  getDepsDataOfMergeConfig(id: BitId) {\n    return this.mergeConfigDepsResolverDataCache[id.toString()];\n  }\n\n  /**\n   * Calculate the component config based on:\n   * the config property in the .bitmap file\n   * the component.json file in the component folder\n   * matching pattern in the variants config\n   * defaults extensions from workspace config\n   * extensions from the model.\n   */\n  // eslint-disable-next-line complexity\n  async merge(\n    componentId: ComponentID,\n    componentFromScope?: Component,\n    excludeOrigins: ExtensionsOrigin[] = []\n  ): Promise<{\n    extensions: ExtensionDataList;\n    beforeMerge: Array<{ extensions: ExtensionDataList; origin: ExtensionsOrigin; extraData: any }>; // useful for debugging\n    errors?: Error[];\n  }> {\n    // TODO: consider caching this result\n    let configFileExtensions: ExtensionDataList | undefined;\n    let variantsExtensions: ExtensionDataList | undefined;\n    let wsDefaultExtensions: ExtensionDataList | undefined;\n    const mergeFromScope = true;\n    const errors: Error[] = [];\n\n    const bitMapEntry = this.consumer.bitMap.getComponentIfExist(componentId._legacy);\n    const bitMapExtensions = bitMapEntry?.config;\n\n    let configMerge: Record<string, any> | undefined;\n    try {\n      configMerge = await this.mergeConflictFile.getConflictParsed(componentId.toStringWithoutVersion());\n    } catch (err) {\n      if (!(err instanceof MergeConfigConflict)) {\n        throw err;\n      }\n      this.workspace.logger.error(`unable to parse the config file for ${componentId.toString()} due to conflicts`);\n      errors.push(err);\n    }\n\n    const adjustEnvsOnConfigMerge = (conf: Record<string, any>) => {\n      const env = conf[EnvsAspect.id]?.env;\n      if (!env) return;\n      const [id] = env.split('@');\n      conf[EnvsAspect.id] = { env: id };\n      conf[env] = {};\n    };\n\n    const unmergedData = this.getUnmergedData(componentId);\n    const unmergedDataMergeConf = unmergedData?.mergedConfig;\n    const getMergeConfigCombined = () => {\n      if (!configMerge && !unmergedDataMergeConf) return undefined;\n      if (!configMerge) return unmergedDataMergeConf;\n      if (!unmergedDataMergeConf) return configMerge;\n\n      return mergeWith(configMerge, unmergedDataMergeConf, (objValue, srcValue) => {\n        if (Array.isArray(objValue)) {\n          // critical for dependencyResolver.policy.*dependencies. otherwise, it will override the array\n          return objValue.concat(srcValue);\n        }\n        return undefined;\n      });\n    };\n    const mergeConfigCombined = getMergeConfigCombined();\n    adjustEnvsOnConfigMerge(mergeConfigCombined || {});\n\n    const configMergeExtensions = mergeConfigCombined\n      ? ExtensionDataList.fromConfigObject(mergeConfigCombined)\n      : undefined;\n\n    this.removeAutoDepsFromConfig(componentId, configMergeExtensions);\n    const scopeExtensions = componentFromScope?.config?.extensions || new ExtensionDataList();\n    // backward compatibility. previously, it was saved as an array into the model (when there was merge-config)\n    this.removeAutoDepsFromConfig(componentId, scopeExtensions, true);\n    const [specific, nonSpecific] = partition(scopeExtensions, (entry) => entry.config[AspectSpecificField] === true);\n    const scopeExtensionsNonSpecific = new ExtensionDataList(...nonSpecific);\n    const scopeExtensionsSpecific = new ExtensionDataList(...specific);\n\n    const componentConfigFile = await this.workspace.componentConfigFile(componentId);\n    if (componentConfigFile) {\n      configFileExtensions = componentConfigFile.aspects.toLegacy();\n    }\n    const relativeComponentDir = this.workspace.componentDir(componentId, { ignoreVersion: true }, { relative: true });\n    const variantConfig = this.workspace.variants.byRootDirAndName(relativeComponentDir, componentId.fullName);\n    if (variantConfig) {\n      variantsExtensions = variantConfig.extensions.clone();\n      // Do not merge from scope when there is specific variant (which is not *) that match the component\n      // if (variantConfig.maxSpecificity > 0) {\n      //   mergeFromScope = false;\n      // }\n    }\n    // We don't stop on each step because we want to merge the default scope even if propagate=false but the default scope is not defined\n    // in the case the same extension pushed twice, the former takes precedence (opposite of Object.assign)\n    const extensionsToMerge: Array<{ origin: ExtensionsOrigin; extensions: ExtensionDataList; extraData: any }> = [];\n    let envWasFoundPreviously = false;\n    const removedExtensionIds: string[] = [];\n\n    const addExtensionsToMerge = async (extensions: ExtensionDataList, origin: ExtensionsOrigin, extraData?: any) => {\n      if (!extensions.length) {\n        return;\n      }\n      removedExtensionIds.push(...extensions.filter((extData) => extData.isRemoved).map((extData) => extData.stringId));\n      const extsWithoutRemoved = extensions.filterRemovedExtensions();\n      const selfInMergedExtensions = extsWithoutRemoved.findExtension(\n        componentId._legacy.toStringWithoutScopeAndVersion(),\n        true,\n        true\n      );\n      const extsWithoutSelf = selfInMergedExtensions?.extensionId\n        ? extsWithoutRemoved.remove(selfInMergedExtensions.extensionId)\n        : extsWithoutRemoved;\n      const { extensionDataListFiltered, envIsCurrentlySet } = await this.filterEnvsFromExtensionsIfNeeded(\n        extsWithoutSelf,\n        envWasFoundPreviously,\n        origin\n      );\n      if (envIsCurrentlySet) {\n        await this.warnAboutMisconfiguredEnv(componentId, extensions);\n        envWasFoundPreviously = true;\n      }\n\n      extensionsToMerge.push({ origin, extensions: extensionDataListFiltered, extraData });\n    };\n    const setDataListAsSpecific = (extensions: ExtensionDataList) => {\n      extensions.forEach((dataEntry) => (dataEntry.config[AspectSpecificField] = true));\n    };\n    if (bitMapExtensions && !excludeOrigins.includes('BitmapFile')) {\n      const extensionDataList = ExtensionDataList.fromConfigObject(bitMapExtensions);\n      setDataListAsSpecific(extensionDataList);\n      await addExtensionsToMerge(extensionDataList, 'BitmapFile');\n    }\n    // config-merge is after the .bitmap. because normally if you have config set in .bitmap, you won't\n    // be able to lane-merge. (unless you specify --ignore-config-changes).\n    // so, if there is config in .bitmap, it probably happened after lane-merge.\n    if (configMergeExtensions && !excludeOrigins.includes('ConfigMerge')) {\n      await addExtensionsToMerge(ExtensionDataList.fromArray(configMergeExtensions), 'ConfigMerge');\n    }\n    if (configFileExtensions && !excludeOrigins.includes('ComponentJsonFile')) {\n      setDataListAsSpecific(configFileExtensions);\n      await addExtensionsToMerge(configFileExtensions, 'ComponentJsonFile');\n    }\n    if (!excludeOrigins.includes('ModelSpecific')) {\n      await addExtensionsToMerge(ExtensionDataList.fromArray(scopeExtensionsSpecific), 'ModelSpecific');\n    }\n    let continuePropagating = componentConfigFile?.propagate ?? true;\n    if (variantsExtensions && continuePropagating && !excludeOrigins.includes('WorkspaceVariants')) {\n      const appliedRules = variantConfig?.sortedMatches.map(({ pattern, specificity }) => ({ pattern, specificity }));\n      await addExtensionsToMerge(variantsExtensions, 'WorkspaceVariants', { appliedRules });\n    }\n    continuePropagating = continuePropagating && (variantConfig?.propagate ?? true);\n    // Do not apply default extensions on the default extensions (it will create infinite loop when loading them)\n    const isDefaultExtension = wsDefaultExtensions?.findExtension(componentId.toString(), true, true);\n    if (\n      wsDefaultExtensions &&\n      continuePropagating &&\n      !isDefaultExtension &&\n      !excludeOrigins.includes('WorkspaceDefault')\n    ) {\n      await addExtensionsToMerge(wsDefaultExtensions, 'WorkspaceDefault');\n    }\n    if (mergeFromScope && continuePropagating && !excludeOrigins.includes('ModelNonSpecific')) {\n      await addExtensionsToMerge(scopeExtensionsNonSpecific, 'ModelNonSpecific');\n    }\n\n    // It's important to do this resolution before the merge, otherwise we have issues with extensions\n    // coming from scope with local scope name, as opposed to the same extension comes from the workspace with default scope name\n    await Promise.all(extensionsToMerge.map((list) => this.resolveExtensionListIds(list.extensions)));\n    const afterMerge = ExtensionDataList.mergeConfigs(extensionsToMerge.map((ext) => ext.extensions));\n    await this.loadExtensions(afterMerge, componentId);\n    const withoutRemoved = afterMerge.filter((extData) => !removedExtensionIds.includes(extData.stringId));\n    const extensions = ExtensionDataList.fromArray(withoutRemoved);\n    return {\n      extensions,\n      beforeMerge: extensionsToMerge,\n      errors,\n    };\n  }\n\n  /**\n   * from the merge-config we get the dep-resolver policy as an array, because it needs to support \"force\" prop.\n   * however, when we save the config, we want to save it as an object, so we need split the data into two:\n   * 1. force: true, which gets saved into the config.\n   * 2. force: false, which gets saved into the data.dependencies later on. see the LegacyDependencyResolver.registerOnComponentAutoDetectOverridesGetter hook\n   */\n  private removeAutoDepsFromConfig(componentId: ComponentID, conf?: ExtensionDataList, fromScope = false) {\n    if (!conf) return;\n    const policy = conf.findCoreExtension(DependencyResolverAspect.id)?.config.policy;\n    if (!policy) return;\n\n    const mergeConfigObj = {};\n    ['dependencies', 'devDependencies', 'peerDependencies'].forEach((key) => {\n      if (!policy[key]) return;\n      // this is only relevant when it is saved as an array. otherwise, it's always force: true.\n      if (!Array.isArray(policy[key])) return;\n\n      mergeConfigObj[key] = policy[key].filter((dep) => !dep.force);\n      policy[key] = policy[key].filter((dep) => dep.force);\n\n      if (!policy[key].length) {\n        delete policy[key];\n        return;\n      }\n      // convert to object\n      policy[key] = policy[key].reduce((acc, current) => {\n        acc[current.name] = current.version;\n        return acc;\n      }, {});\n    });\n\n    if (!fromScope) {\n      if (!this.mergeConfigDepsResolverDataCache[componentId.toString()]) {\n        this.mergeConfigDepsResolverDataCache[componentId.toString()] = {};\n      }\n      this.mergeConfigDepsResolverDataCache[componentId.toString()] = merge(\n        this.mergeConfigDepsResolverDataCache[componentId.toString()],\n        mergeConfigObj\n      );\n    }\n  }\n\n  private getUnmergedData(componentId: ComponentID): UnmergedComponent | undefined {\n    return this.workspace.scope.legacyScope.objects.unmergedComponents.getEntry(componentId._legacy.name);\n  }\n\n  private async warnAboutMisconfiguredEnv(componentId: ComponentID, extensionDataList: ExtensionDataList) {\n    if (!(await this.workspace.hasId(componentId))) {\n      // if this is a dependency and not belong to the workspace, don't show the warning\n      return;\n    }\n    const envAspect = extensionDataList.findExtension(EnvsAspect.id);\n    const envFromEnvsAspect = envAspect?.config.env;\n    if (!envFromEnvsAspect) return;\n    if (this.workspace.envs.getCoreEnvsIds().includes(envFromEnvsAspect)) return;\n    if (this.warnedAboutMisconfiguredEnvs.includes(envFromEnvsAspect)) return;\n    let env: Component;\n    try {\n      const envId = await this.workspace.resolveComponentId(envFromEnvsAspect);\n      env = await this.workspace.get(envId);\n    } catch (err) {\n      return; // unable to get the component for some reason. don't sweat it. forget about the warning\n    }\n    if (!this.workspace.envs.isUsingEnvEnv(env)) {\n      this.warnedAboutMisconfiguredEnvs.push(envFromEnvsAspect);\n      this.workspace.logger.consoleWarning(\n        `env \"${envFromEnvsAspect}\" is not of type env. (correct the env's type, or component config with \"bit env set ${envFromEnvsAspect} teambit.envs/env\")`\n      );\n    }\n  }\n\n  private async filterEnvsFromExtensionsIfNeeded(\n    extensionDataList: ExtensionDataList,\n    envWasFoundPreviously: boolean,\n    origin: ExtensionsOrigin\n  ) {\n    const envAspect = extensionDataList.findExtension(EnvsAspect.id);\n    const envFromEnvsAspect: string | undefined = envAspect?.config.env || envAspect?.data.id;\n    if (envWasFoundPreviously && envAspect) {\n      const nonEnvs = extensionDataList.filter((e) => {\n        // normally the env-id inside the envs aspect doesn't have a version, but the aspect itself has a version.\n        if (e.stringId === envFromEnvsAspect || e.extensionId?.toStringWithoutVersion() === envFromEnvsAspect)\n          return false;\n        return true;\n      });\n      // still, aspect env may have other data other then config.env.\n      delete envAspect.config.env;\n      return { extensionDataListFiltered: new ExtensionDataList(...nonEnvs), envIsCurrentlySet: true };\n    }\n    if (envFromEnvsAspect && (origin === 'ModelNonSpecific' || origin === 'ModelSpecific')) {\n      // if env was found, search for this env in the workspace and if found, replace the env-id with the one from the workspace\n      const envAspectExt = extensionDataList.find((e) => e.extensionId?.toStringWithoutVersion() === envFromEnvsAspect);\n      const ids = await this.workspace.listIds();\n      const envAspectId = envAspectExt?.extensionId;\n      const found = envAspectId && ids.find((id) => id._legacy.isEqualWithoutVersion(envAspectId));\n      if (found) {\n        envAspectExt.extensionId = found._legacy;\n      }\n    }\n    return { extensionDataListFiltered: extensionDataList, envIsCurrentlySet: Boolean(envFromEnvsAspect) };\n  }\n\n  /**\n   * Load all unloaded extensions from a list\n   * @param extensions list of extensions with config to load\n   */\n  private async loadExtensions(\n    extensions: ExtensionDataList,\n    originatedFrom?: ComponentID,\n    throwOnError = false\n  ): Promise<void> {\n    const extensionsIdsP = extensions.map(async (extensionEntry) => {\n      // Core extension\n      if (!extensionEntry.extensionId) {\n        return extensionEntry.stringId as string;\n      }\n\n      const id = await this.workspace.resolveComponentId(extensionEntry.extensionId);\n      // return this.resolveComponentId(extensionEntry.extensionId);\n      return id.toString();\n    });\n    const extensionsIds: string[] = await Promise.all(extensionsIdsP);\n    const loadedExtensions = this.harmony.extensionsIds;\n    const extensionsToLoad = difference(extensionsIds, loadedExtensions);\n    if (!extensionsToLoad.length) return;\n    await this.workspace.loadAspects(extensionsToLoad, throwOnError, originatedFrom?.toString());\n  }\n\n  /**\n   * This will mutate the entries with extensionId prop to have resolved legacy id\n   * This should be worked on the extension data list not the new aspect list\n   * @param extensionList\n   */\n  private async resolveExtensionListIds(extensionList: ExtensionDataList): Promise<ExtensionDataList> {\n    const promises = extensionList.map(async (entry) => {\n      if (entry.extensionId) {\n        const id = await this.workspace.resolveComponentId(entry.extensionId);\n        entry.extensionId = id._legacy;\n      }\n\n      return entry;\n    });\n    await Promise.all(promises);\n    return extensionList;\n  }\n}\n"],"mappings":"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"}

package/dist/component-tree.widget.js

@@ -12,44 +12,28 @@ function _defineProperty2() {
   };
   return data;
 }
-function _componentUi() {
-  const data = require("@teambit/component.ui.component-status-resolver");
-  _componentUi = function () {
-    return data;
-  };
-  return data;
-}
-function _lanesHooks() {
-  const data = require("@teambit/lanes.hooks.use-lanes");
-  _lanesHooks = function () {
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+  _react = function () {
     return data;
   };
   return data;
 }
-function _react() {
-  const data = _interopRequireWildcard(require("react"));
-  _react = function () {
+function _componentUi() {
+  const data = require("@teambit/component.ui.component-status-resolver");
+  _componentUi = function () {
     return data;
   };
   return data;
 }
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 class ComponentTreeWidget {
   constructor() {
     (0, _defineProperty2().default)(this, "widget", ({
       component
     }) => {
-      const {
-        lanesModel
-      } = (0, _lanesHooks().useLanes)();
-      const isInCurrentLane = (0, _react().useMemo)(() => {
-        return component.id && (lanesModel === null || lanesModel === void 0 ? void 0 : lanesModel.isComponentOnLaneButNotOnMain(component.id));
-      }, [lanesModel === null || lanesModel === void 0 ? void 0 : lanesModel.viewedLane, component.id]);
       return /*#__PURE__*/_react().default.createElement(_componentUi().ComponentStatusResolver, {
         status: component.status,
-        issuesCount: component.issuesCount,
-        isInCurrentLane: isInCurrentLane
+        issuesCount: component.issuesCount
       });
     });
   }

package/dist/component-tree.widget.js.map

@@ -1 +1 @@
-{"version":3,"names":["ComponentTreeWidget","component","lanesModel","useLanes","isInCurrentLane","useMemo","id","isComponentOnLaneButNotOnMain","viewedLane","status","issuesCount"],"sources":["component-tree.widget.tsx"],"sourcesContent":["import { ComponentTreeNode, ComponentTreeNodeProps } from '@teambit/component-tree';\nimport { ComponentStatusResolver } from '@teambit/component.ui.component-status-resolver';\nimport { useLanes } from '@teambit/lanes.hooks.use-lanes';\nimport React, { useMemo } from 'react';\n\nexport class ComponentTreeWidget implements ComponentTreeNode {\n  widget = ({ component }: ComponentTreeNodeProps) => {\n    const { lanesModel } = useLanes();\n\n    const isInCurrentLane = useMemo(() => {\n      return component.id && lanesModel?.isComponentOnLaneButNotOnMain(component.id);\n    }, [lanesModel?.viewedLane, component.id]);\n\n    return (\n      <ComponentStatusResolver\n        status={component.status}\n        issuesCount={component.issuesCount}\n        isInCurrentLane={isInCurrentLane}\n      />\n    );\n  };\n}\n"],"mappings":";;;;;;;;;;;;;;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAAuC;AAAA;AAEhC,MAAMA,mBAAmB,CAA8B;EAAA;IAAA,gDACnD,CAAC;MAAEC;IAAkC,CAAC,KAAK;MAClD,MAAM;QAAEC;MAAW,CAAC,GAAG,IAAAC,sBAAQ,GAAE;MAEjC,MAAMC,eAAe,GAAG,IAAAC,gBAAO,EAAC,MAAM;QACpC,OAAOJ,SAAS,CAACK,EAAE,KAAIJ,UAAU,aAAVA,UAAU,uBAAVA,UAAU,CAAEK,6BAA6B,CAACN,SAAS,CAACK,EAAE,CAAC;MAChF,CAAC,EAAE,CAACJ,UAAU,aAAVA,UAAU,uBAAVA,UAAU,CAAEM,UAAU,EAAEP,SAAS,CAACK,EAAE,CAAC,CAAC;MAE1C,oBACE,+BAAC,sCAAuB;QACtB,MAAM,EAAEL,SAAS,CAACQ,MAAO;QACzB,WAAW,EAAER,SAAS,CAACS,WAAY;QACnC,eAAe,EAAEN;MAAgB,EACjC;IAEN,CAAC;EAAA;AACH;AAAC"}
+{"version":3,"names":["ComponentTreeWidget","component","status","issuesCount"],"sources":["component-tree.widget.tsx"],"sourcesContent":["import React from 'react';\nimport { ComponentTreeNode, ComponentTreeNodeProps } from '@teambit/component-tree';\nimport { ComponentStatusResolver } from '@teambit/component.ui.component-status-resolver';\n\nexport class ComponentTreeWidget implements ComponentTreeNode {\n  widget = ({ component }: ComponentTreeNodeProps) => {\n    return <ComponentStatusResolver status={component.status} issuesCount={component.issuesCount} />;\n  };\n}\n"],"mappings":";;;;;;;;;;;;;;AAAA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEO,MAAMA,mBAAmB,CAA8B;EAAA;IAAA,gDACnD,CAAC;MAAEC;IAAkC,CAAC,KAAK;MAClD,oBAAO,+BAAC,sCAAuB;QAAC,MAAM,EAAEA,SAAS,CAACC,MAAO;QAAC,WAAW,EAAED,SAAS,CAACE;MAAY,EAAG;IAClG,CAAC;EAAA;AACH;AAAC"}

package/dist/{preview-1677431903896.js → preview-1677555458635.js}

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

package/dist/workspace-component/component-status.d.ts

@@ -36,10 +36,6 @@ export declare class ComponentStatus {
      *  the component is not authored and not imported.
      */
     readonly nested?: boolean | undefined;
-    /**
-     * does the component exist on the current lane
-     */
-    readonly isInCurrentLane?: boolean | undefined;
     constructor(
     /**
      * is the component modified.
@@ -72,10 +68,6 @@ export declare class ComponentStatus {
     /**
      *  the component is not authored and not imported.
      */
-    nested?: boolean | undefined, 
-    /**
-     * does the component exist on the current lane
-     */
-    isInCurrentLane?: boolean | undefined);
-    static fromLegacy(status: LegacyComponentStatus, hasModifiedDependencies: boolean, isOutdated: boolean, isInCurrentLane?: boolean): ComponentStatus;
+    nested?: boolean | undefined);
+    static fromLegacy(status: LegacyComponentStatus, hasModifiedDependencies: boolean, isOutdated: boolean): ComponentStatus;
 }

package/dist/workspace-component/component-status.js

@@ -37,11 +37,7 @@ class ComponentStatus {
   /**
    *  the component is not authored and not imported.
    */
-  nested,
-  /**
-   * does the component exist on the current lane
-   */
-  isInCurrentLane) {
+  nested) {
     this.modifyInfo = modifyInfo;
     this.isNew = isNew;
     this.isDeleted = isDeleted;
@@ -50,14 +46,13 @@ class ComponentStatus {
     this.isInScope = isInScope;
     this.isOutdated = isOutdated;
     this.nested = nested;
-    this.isInCurrentLane = isInCurrentLane;
   }
-  static fromLegacy(status, hasModifiedDependencies, isOutdated, isInCurrentLane) {
+  static fromLegacy(status, hasModifiedDependencies, isOutdated) {
     const modify = {
       hasModifiedFiles: !!status.modified,
       hasModifiedDependencies
     };
-    return new ComponentStatus(modify, !!status.newlyCreated, !!status.deleted, !!status.staged, !status.notExist, !status.missingFromScope, isOutdated, !!status.nested, isInCurrentLane);
+    return new ComponentStatus(modify, !!status.newlyCreated, !!status.deleted, !!status.staged, !status.notExist, !status.missingFromScope, isOutdated, !!status.nested);
   }
 }
 exports.ComponentStatus = ComponentStatus;

package/dist/workspace-component/component-status.js.map

@@ -1 +1 @@
-{"version":3,"names":["ComponentStatus","constructor","modifyInfo","isNew","isDeleted","isStaged","isInWorkspace","isInScope","isOutdated","nested","isInCurrentLane","fromLegacy","status","hasModifiedDependencies","modify","hasModifiedFiles","modified","newlyCreated","deleted","staged","notExist","missingFromScope"],"sources":["component-status.ts"],"sourcesContent":["import { ComponentStatus as LegacyComponentStatus } from '@teambit/legacy/dist/consumer/component-ops/component-status-loader';\n\nexport type ModifyInfo = {\n  hasModifiedFiles: boolean;\n  hasModifiedDependencies: boolean;\n};\n\nexport class ComponentStatus {\n  constructor(\n    /**\n     * is the component modified.\n     */\n    readonly modifyInfo: ModifyInfo,\n\n    /**\n     * is the new component new.\n     */\n    readonly isNew: boolean,\n\n    /**\n     * is the component deleted from the workspace.\n     */\n    readonly isDeleted: boolean,\n\n    /**\n     * is the component staged.\n     */\n    readonly isStaged: boolean,\n\n    /**\n     * does the component exists in the workspace.\n     */\n    readonly isInWorkspace: boolean,\n\n    /**\n     * does the component exists in the scope.\n     */\n    readonly isInScope: boolean,\n\n    /**\n     * does the component is outdated (pending for update).\n     */\n    readonly isOutdated: boolean,\n\n    /**\n     *  the component is not authored and not imported.\n     */\n    readonly nested?: boolean,\n    /**\n     * does the component exist on the current lane\n     */\n    readonly isInCurrentLane?: boolean\n  ) {}\n\n  static fromLegacy(\n    status: LegacyComponentStatus,\n    hasModifiedDependencies: boolean,\n    isOutdated: boolean,\n    isInCurrentLane?: boolean\n  ) {\n    const modify: ModifyInfo = {\n      hasModifiedFiles: !!status.modified,\n      hasModifiedDependencies,\n    };\n    return new ComponentStatus(\n      modify,\n      !!status.newlyCreated,\n      !!status.deleted,\n      !!status.staged,\n      !status.notExist,\n      !status.missingFromScope,\n      isOutdated,\n      !!status.nested,\n      isInCurrentLane\n    );\n  }\n}\n"],"mappings":";;;;;;AAOO,MAAMA,eAAe,CAAC;EAC3BC,WAAW;EACT;AACJ;AACA;EACaC,UAAsB;EAE/B;AACJ;AACA;EACaC,KAAc;EAEvB;AACJ;AACA;EACaC,SAAkB;EAE3B;AACJ;AACA;EACaC,QAAiB;EAE1B;AACJ;AACA;EACaC,aAAsB;EAE/B;AACJ;AACA;EACaC,SAAkB;EAE3B;AACJ;AACA;EACaC,UAAmB;EAE5B;AACJ;AACA;EACaC,MAAgB;EACzB;AACJ;AACA;EACaC,eAAyB,EAClC;IAAA,KAxCSR,UAAsB,GAAtBA,UAAsB;IAAA,KAKtBC,KAAc,GAAdA,KAAc;IAAA,KAKdC,SAAkB,GAAlBA,SAAkB;IAAA,KAKlBC,QAAiB,GAAjBA,QAAiB;IAAA,KAKjBC,aAAsB,GAAtBA,aAAsB;IAAA,KAKtBC,SAAkB,GAAlBA,SAAkB;IAAA,KAKlBC,UAAmB,GAAnBA,UAAmB;IAAA,KAKnBC,MAAgB,GAAhBA,MAAgB;IAAA,KAIhBC,eAAyB,GAAzBA,eAAyB;EACjC;EAEH,OAAOC,UAAU,CACfC,MAA6B,EAC7BC,uBAAgC,EAChCL,UAAmB,EACnBE,eAAyB,EACzB;IACA,MAAMI,MAAkB,GAAG;MACzBC,gBAAgB,EAAE,CAAC,CAACH,MAAM,CAACI,QAAQ;MACnCH;IACF,CAAC;IACD,OAAO,IAAIb,eAAe,CACxBc,MAAM,EACN,CAAC,CAACF,MAAM,CAACK,YAAY,EACrB,CAAC,CAACL,MAAM,CAACM,OAAO,EAChB,CAAC,CAACN,MAAM,CAACO,MAAM,EACf,CAACP,MAAM,CAACQ,QAAQ,EAChB,CAACR,MAAM,CAACS,gBAAgB,EACxBb,UAAU,EACV,CAAC,CAACI,MAAM,CAACH,MAAM,EACfC,eAAe,CAChB;EACH;AACF;AAAC"}
+{"version":3,"names":["ComponentStatus","constructor","modifyInfo","isNew","isDeleted","isStaged","isInWorkspace","isInScope","isOutdated","nested","fromLegacy","status","hasModifiedDependencies","modify","hasModifiedFiles","modified","newlyCreated","deleted","staged","notExist","missingFromScope"],"sources":["component-status.ts"],"sourcesContent":["import { ComponentStatus as LegacyComponentStatus } from '@teambit/legacy/dist/consumer/component-ops/component-status-loader';\n\nexport type ModifyInfo = {\n  hasModifiedFiles: boolean;\n  hasModifiedDependencies: boolean;\n};\n\nexport class ComponentStatus {\n  constructor(\n    /**\n     * is the component modified.\n     */\n    readonly modifyInfo: ModifyInfo,\n\n    /**\n     * is the new component new.\n     */\n    readonly isNew: boolean,\n\n    /**\n     * is the component deleted from the workspace.\n     */\n    readonly isDeleted: boolean,\n\n    /**\n     * is the component staged.\n     */\n    readonly isStaged: boolean,\n\n    /**\n     * does the component exists in the workspace.\n     */\n    readonly isInWorkspace: boolean,\n\n    /**\n     * does the component exists in the scope.\n     */\n    readonly isInScope: boolean,\n\n    /**\n     * does the component is outdated (pending for update).\n     */\n    readonly isOutdated: boolean,\n\n    /**\n     *  the component is not authored and not imported.\n     */\n    readonly nested?: boolean\n  ) {}\n\n  static fromLegacy(status: LegacyComponentStatus, hasModifiedDependencies: boolean, isOutdated: boolean) {\n    const modify: ModifyInfo = {\n      hasModifiedFiles: !!status.modified,\n      hasModifiedDependencies,\n    };\n    return new ComponentStatus(\n      modify,\n      !!status.newlyCreated,\n      !!status.deleted,\n      !!status.staged,\n      !status.notExist,\n      !status.missingFromScope,\n      isOutdated,\n      !!status.nested\n    );\n  }\n}\n"],"mappings":";;;;;;AAOO,MAAMA,eAAe,CAAC;EAC3BC,WAAW;EACT;AACJ;AACA;EACaC,UAAsB;EAE/B;AACJ;AACA;EACaC,KAAc;EAEvB;AACJ;AACA;EACaC,SAAkB;EAE3B;AACJ;AACA;EACaC,QAAiB;EAE1B;AACJ;AACA;EACaC,aAAsB;EAE/B;AACJ;AACA;EACaC,SAAkB;EAE3B;AACJ;AACA;EACaC,UAAmB;EAE5B;AACJ;AACA;EACaC,MAAgB,EACzB;IAAA,KApCSP,UAAsB,GAAtBA,UAAsB;IAAA,KAKtBC,KAAc,GAAdA,KAAc;IAAA,KAKdC,SAAkB,GAAlBA,SAAkB;IAAA,KAKlBC,QAAiB,GAAjBA,QAAiB;IAAA,KAKjBC,aAAsB,GAAtBA,aAAsB;IAAA,KAKtBC,SAAkB,GAAlBA,SAAkB;IAAA,KAKlBC,UAAmB,GAAnBA,UAAmB;IAAA,KAKnBC,MAAgB,GAAhBA,MAAgB;EACxB;EAEH,OAAOC,UAAU,CAACC,MAA6B,EAAEC,uBAAgC,EAAEJ,UAAmB,EAAE;IACtG,MAAMK,MAAkB,GAAG;MACzBC,gBAAgB,EAAE,CAAC,CAACH,MAAM,CAACI,QAAQ;MACnCH;IACF,CAAC;IACD,OAAO,IAAIZ,eAAe,CACxBa,MAAM,EACN,CAAC,CAACF,MAAM,CAACK,YAAY,EACrB,CAAC,CAACL,MAAM,CAACM,OAAO,EAChB,CAAC,CAACN,MAAM,CAACO,MAAM,EACf,CAACP,MAAM,CAACQ,QAAQ,EAChB,CAACR,MAAM,CAACS,gBAAgB,EACxBZ,UAAU,EACV,CAAC,CAACG,MAAM,CAACF,MAAM,CAChB;EACH;AACF;AAAC"}

package/dist/workspace.ui.drawer.js

@@ -13,7 +13,7 @@ function _extends2() {
   return data;
 }
 function _react() {
-  const data = _interopRequireDefault(require("react"));
+  const data = _interopRequireWildcard(require("react"));
   _react = function () {
     return data;
   };
@@ -47,6 +47,15 @@ function _lanesHooks2() {
   };
   return data;
 }
+function _workspaceContext() {
+  const data = require("./ui/workspace/workspace-context");
+  _workspaceContext = function () {
+    return data;
+  };
+  return data;
+}
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 const workspaceDrawer = ({
   treeWidgets,
   filtersSlot,
@@ -86,17 +95,22 @@ const workspaceDrawer = ({
       const viewedLaneId = lanesModel === null || lanesModel === void 0 ? void 0 : (_lanesModel$viewedLan = lanesModel.viewedLane) === null || _lanesModel$viewedLan === void 0 ? void 0 : _lanesModel$viewedLan.id;
       const defaultLane = lanesModel === null || lanesModel === void 0 ? void 0 : lanesModel.getDefaultLane();
       const isViewingDefaultLane = viewedLaneId && (defaultLane === null || defaultLane === void 0 ? void 0 : defaultLane.id.isEqual(viewedLaneId));
+      const isViewingWorkspaceVersions = lanesModel === null || lanesModel === void 0 ? void 0 : lanesModel.isViewingCurrentLane();
       const {
         components: laneComponents = [],
         loading: laneCompsLoading
-      } = (0, _lanesHooks2().useLaneComponents)(viewedLaneId);
+      } = (0, _lanesHooks2().useLaneComponents)(!isViewingWorkspaceVersions ? viewedLaneId : undefined);
       const {
         components: mainComponents = [],
         loading: mainCompsLoading
       } = (0, _lanesHooks2().useLaneComponents)(!isViewingDefaultLane ? defaultLane === null || defaultLane === void 0 ? void 0 : defaultLane.id : undefined);
+      const workspace = (0, _react().useContext)(_workspaceContext().WorkspaceContext);
+      const {
+        components: workspaceComponents
+      } = workspace;
 
       // lane components + main components
-      const components = isViewingDefaultLane ? laneComponents : mergeComponents(mainComponents, laneComponents);
+      const components = isViewingDefaultLane ? laneComponents : !isViewingWorkspaceVersions && mergeComponents(mainComponents, laneComponents) || workspaceComponents;
       return {
         loading: lanesLoading || laneCompsLoading || mainCompsLoading,
         components

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","components","laneComponents","laneCompsLoading","useLaneComponents","mainComponents","mainCompsLoading","undefined","mergeComponents","mainComponentsThatAreNotOnLane","filter","mainComponent","find","laneComponent","toStringWithoutVersion","concat"],"sources":["workspace.ui.drawer.tsx"],"sourcesContent":["import React 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';\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      const viewedLaneId = lanesModel?.viewedLane?.id;\n      const defaultLane = lanesModel?.getDefaultLane();\n      const isViewingDefaultLane = viewedLaneId && defaultLane?.id.isEqual(viewedLaneId);\n\n      const { components: laneComponents = [], loading: laneCompsLoading } = useLaneComponents(viewedLaneId);\n      const { components: mainComponents = [], loading: mainCompsLoading } = useLaneComponents(\n        !isViewingDefaultLane ? defaultLane?.id : undefined\n      );\n\n      // lane components + main components\n      const components = isViewingDefaultLane ? laneComponents : mergeComponents(mainComponents, laneComponents);\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      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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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/workspace",
-  "version": "0.0.998",
+  "version": "0.0.999",
   "homepage": "https://bit.dev/teambit/workspace/workspace",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.workspace",
     "name": "workspace",
-    "version": "0.0.998"
+    "version": "0.0.999"
   },
   "dependencies": {
     "lodash": "4.17.21",
@@ -30,52 +30,52 @@
     "@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.998",
-    "@teambit/dependency-resolver": "0.0.998",
-    "@teambit/envs": "0.0.998",
+    "@teambit/component": "0.0.999",
+    "@teambit/dependency-resolver": "0.0.999",
+    "@teambit/envs": "0.0.999",
     "@teambit/legacy-bit-id": "0.0.423",
     "@teambit/bit-error": "0.0.402",
     "@teambit/component-id": "0.0.427",
-    "@teambit/lane-id": "0.0.186",
-    "@teambit/logger": "0.0.762",
-    "@teambit/scope": "0.0.998",
-    "@teambit/graph": "0.0.998",
-    "@teambit/cli": "0.0.669",
-    "@teambit/isolator": "0.0.998",
-    "@teambit/component-tree": "0.0.786",
-    "@teambit/component.ui.component-status-resolver": "0.0.504",
-    "@teambit/lanes.hooks.use-lanes": "0.0.132",
+    "@teambit/lane-id": "0.0.187",
+    "@teambit/logger": "0.0.763",
+    "@teambit/scope": "0.0.999",
+    "@teambit/graph": "0.0.999",
+    "@teambit/cli": "0.0.670",
+    "@teambit/isolator": "0.0.999",
+    "@teambit/component-tree": "0.0.787",
+    "@teambit/component.ui.component-status-resolver": "0.0.505",
     "@teambit/harmony.modules.resolved-component": "0.0.491",
-    "@teambit/compiler": "0.0.998",
-    "@teambit/graphql": "0.0.998",
-    "@teambit/aspect-loader": "0.0.998",
-    "@teambit/bundler": "0.0.998",
-    "@teambit/pubsub": "0.0.998",
-    "@teambit/ui": "0.0.998",
-    "@teambit/variants": "0.0.774",
+    "@teambit/compiler": "0.0.999",
+    "@teambit/graphql": "0.0.999",
+    "@teambit/aspect-loader": "0.0.999",
+    "@teambit/bundler": "0.0.999",
+    "@teambit/pubsub": "0.0.999",
+    "@teambit/ui": "0.0.999",
+    "@teambit/variants": "0.0.775",
     "@teambit/component-issues": "0.0.88",
-    "@teambit/config": "0.0.682",
+    "@teambit/config": "0.0.683",
     "@teambit/harmony.modules.requireable-component": "0.0.491",
     "@teambit/workspace.modules.match-pattern": "0.0.498",
-    "@teambit/workspace.modules.node-modules-linker": "0.0.13",
-    "@teambit/component.ui.component-drawer": "0.0.227",
+    "@teambit/workspace.modules.node-modules-linker": "0.0.14",
+    "@teambit/component.ui.component-drawer": "0.0.228",
     "@teambit/design.ui.tree": "0.0.16",
-    "@teambit/lanes.hooks.use-lane-components": "0.0.131",
-    "@teambit/lanes.ui.models.lanes-model": "0.0.94",
-    "@teambit/ui-foundation.ui.side-bar": "0.0.744",
-    "@teambit/command-bar": "0.0.998",
-    "@teambit/component.ui.component-filters.component-filter-context": "0.0.101",
-    "@teambit/component.ui.component-filters.deprecate-filter": "0.0.101",
-    "@teambit/component.ui.component-filters.env-filter": "0.0.107",
-    "@teambit/component.ui.component-filters.show-main-filter": "0.0.94",
-    "@teambit/sidebar": "0.0.998",
+    "@teambit/lanes.hooks.use-lane-components": "0.0.132",
+    "@teambit/lanes.hooks.use-lanes": "0.0.133",
+    "@teambit/lanes.ui.models.lanes-model": "0.0.95",
+    "@teambit/ui-foundation.ui.side-bar": "0.0.745",
+    "@teambit/command-bar": "0.0.999",
+    "@teambit/component.ui.component-filters.component-filter-context": "0.0.102",
+    "@teambit/component.ui.component-filters.deprecate-filter": "0.0.102",
+    "@teambit/component.ui.component-filters.env-filter": "0.0.108",
+    "@teambit/component.ui.component-filters.show-main-filter": "0.0.95",
+    "@teambit/sidebar": "0.0.999",
     "@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.238",
-    "@teambit/deprecation": "0.0.998",
+    "@teambit/component-descriptor": "0.0.239",
+    "@teambit/deprecation": "0.0.999",
     "@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",
@@ -102,7 +102,7 @@
   "peerDependencies": {
     "react-router-dom": "^6.0.0",
     "@apollo/client": "^3.6.0",
-    "@teambit/legacy": "1.0.451",
+    "@teambit/legacy": "1.0.452",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },

package/workspace-component/component-status.ts

@@ -45,19 +45,10 @@ export class ComponentStatus {
     /**
      *  the component is not authored and not imported.
      */
-    readonly nested?: boolean,
-    /**
-     * does the component exist on the current lane
-     */
-    readonly isInCurrentLane?: boolean
+    readonly nested?: boolean
   ) {}
 
-  static fromLegacy(
-    status: LegacyComponentStatus,
-    hasModifiedDependencies: boolean,
-    isOutdated: boolean,
-    isInCurrentLane?: boolean
-  ) {
+  static fromLegacy(status: LegacyComponentStatus, hasModifiedDependencies: boolean, isOutdated: boolean) {
     const modify: ModifyInfo = {
       hasModifiedFiles: !!status.modified,
       hasModifiedDependencies,
@@ -70,8 +61,7 @@ export class ComponentStatus {
       !status.notExist,
       !status.missingFromScope,
       isOutdated,
-      !!status.nested,
-      isInCurrentLane
+      !!status.nested
     );
   }
 }

package/workspace.ui.drawer.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import { ComponentsDrawer, ComponentFiltersSlot, DrawerWidgetSlot } from '@teambit/component.ui.component-drawer';
 import {
   ComponentView,
@@ -13,6 +13,7 @@ import { TreeNodeProps } from '@teambit/design.ui.tree';
 import { ComponentModel } from '@teambit/component';
 import { LanesModel } from '@teambit/lanes.ui.models.lanes-model';
 import { SidebarWidgetSlot } from './workspace.ui.runtime';
+import { WorkspaceContext } from './ui/workspace/workspace-context';
 
 export type WorkspaceDrawerProps = {
   treeWidgets: SidebarWidgetSlot;
@@ -54,17 +55,25 @@ export const workspaceDrawer = ({
     useLanes,
     useComponents: () => {
       const { lanesModel, loading: lanesLoading } = useLanes();
+
       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(viewedLaneId);
+      const { components: laneComponents = [], loading: laneCompsLoading } = useLaneComponents(
+        !isViewingWorkspaceVersions ? viewedLaneId : undefined
+      );
       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 : mergeComponents(mainComponents, laneComponents);
+      const components = isViewingDefaultLane
+        ? laneComponents
+        : (!isViewingWorkspaceVersions && mergeComponents(mainComponents, laneComponents)) || workspaceComponents;
 
       return {
         loading: lanesLoading || laneCompsLoading || mainCompsLoading,