@teambit/component.ui.component-compare.version-picker 0.0.30 → 0.0.31

package/component-compare-version-picker.tsx

@@ -1,10 +1,7 @@
-import React, { HTMLAttributes, useContext, useMemo } from 'react';
-import compact from 'lodash.compact';
-import { LegacyComponentLog } from '@teambit/legacy-component-log';
+import React, { HTMLAttributes, useMemo } from 'react';
 import { DropdownComponentVersion, VersionDropdown } from '@teambit/component.ui.version-dropdown';
 import { useUpdatedUrlFromQuery } from '@teambit/component.ui.component-compare.hooks.use-component-compare-url';
 import { useComponentCompare } from '@teambit/component.ui.component-compare.context';
-import { ComponentContext } from '@teambit/component';
 import classNames from 'classnames';
 
 import styles from './component-compare-version-picker.module.scss';
@@ -12,37 +9,30 @@ import styles from './component-compare-version-picker.module.scss';
 export type ComponentCompareVersionPickerProps = {} & HTMLAttributes<HTMLDivElement>;
 
 export function ComponentCompareVersionPicker({ className }: ComponentCompareVersionPickerProps) {
-  const component = useContext(ComponentContext);
   const componentCompare = useComponentCompare();
+  const compare = componentCompare?.compare?.model;
 
-  const snaps: DropdownComponentVersion[] = useMemo(() => {
-    const logs = component?.logs;
-    return (logs || [])
-      .filter((log) => !log.tag)
-      .map((snap) => ({ ...snap, version: snap.hash }))
-      .reverse();
-  }, [component?.logs]);
+  const logs =
+    (compare?.logs || []).filter((log) => {
+      const version = log.tag || log.hash;
+      return version !== compare?.id.version;
+    }) || [];
 
-  const tags: DropdownComponentVersion[] = useMemo(() => {
-    const tagLookup = new Map<string, LegacyComponentLog>();
-    const logs = component?.logs;
+  const [tags, snaps] = useMemo(() => {
+    return (logs || []).reduce(
+      ([_tags, _snaps], log) => {
+        if (!log.tag) {
+          _snaps.push({ ...log, version: log.hash });
+        } else {
+          _tags.push({ ...log, version: log.tag as string });
+        }
+        return [_tags, _snaps];
+      },
+      [new Array<DropdownComponentVersion>(), new Array<DropdownComponentVersion>()]
+    );
+  }, [logs]);
 
-    (logs || [])
-      .filter((log) => log.tag)
-      .forEach((tag) => {
-        tagLookup.set(tag?.tag as string, tag);
-      });
-    return compact(
-      component?.tags
-        ?.toArray()
-        .reverse()
-        .map((tag) => tagLookup.get(tag.version.version))
-    ).map((tag) => ({ ...tag, version: tag.tag as string }));
-  }, [component?.logs]);
-
-  const compareVersion = componentCompare?.compare?.hasLocalChanges
-    ? 'workspace'
-    : componentCompare?.compare?.model.version;
+  const compareVersion = componentCompare?.compare?.hasLocalChanges ? 'workspace' : compare?.version;
 
   const baseVersion = componentCompare?.base?.model.version;
 

package/dist/component-compare-version-picker.js

@@ -28,38 +28,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComponentCompareVersionPicker = void 0;
 const react_1 = __importStar(require("react"));
-const lodash_compact_1 = __importDefault(require("lodash.compact"));
 const component_ui_version_dropdown_1 = require("@teambit/component.ui.version-dropdown");
 const component_ui_component_compare_hooks_use_component_compare_url_1 = require("@teambit/component.ui.component-compare.hooks.use-component-compare-url");
 const component_ui_component_compare_context_1 = require("@teambit/component.ui.component-compare.context");
-const component_1 = require("@teambit/component");
 const classnames_1 = __importDefault(require("classnames"));
 const component_compare_version_picker_module_scss_1 = __importDefault(require("./component-compare-version-picker.module.scss"));
 function ComponentCompareVersionPicker({ className }) {
     var _a, _b, _c, _d;
-    const component = (0, react_1.useContext)(component_1.ComponentContext);
     const componentCompare = (0, component_ui_component_compare_context_1.useComponentCompare)();
-    const snaps = (0, react_1.useMemo)(() => {
-        const logs = component === null || component === void 0 ? void 0 : component.logs;
-        return (logs || [])
-            .filter((log) => !log.tag)
-            .map((snap) => (Object.assign(Object.assign({}, snap), { version: snap.hash })))
-            .reverse();
-    }, [component === null || component === void 0 ? void 0 : component.logs]);
-    const tags = (0, react_1.useMemo)(() => {
-        var _a;
-        const tagLookup = new Map();
-        const logs = component === null || component === void 0 ? void 0 : component.logs;
-        (logs || [])
-            .filter((log) => log.tag)
-            .forEach((tag) => {
-            tagLookup.set(tag === null || tag === void 0 ? void 0 : tag.tag, tag);
-        });
-        return (0, lodash_compact_1.default)((_a = component === null || component === void 0 ? void 0 : component.tags) === null || _a === void 0 ? void 0 : _a.toArray().reverse().map((tag) => tagLookup.get(tag.version.version))).map((tag) => (Object.assign(Object.assign({}, tag), { version: tag.tag })));
-    }, [component === null || component === void 0 ? void 0 : component.logs]);
-    const compareVersion = ((_a = componentCompare === null || componentCompare === void 0 ? void 0 : componentCompare.compare) === null || _a === void 0 ? void 0 : _a.hasLocalChanges)
-        ? 'workspace'
-        : (_b = componentCompare === null || componentCompare === void 0 ? void 0 : componentCompare.compare) === null || _b === void 0 ? void 0 : _b.model.version;
+    const compare = (_a = componentCompare === null || componentCompare === void 0 ? void 0 : componentCompare.compare) === null || _a === void 0 ? void 0 : _a.model;
+    const logs = ((compare === null || compare === void 0 ? void 0 : compare.logs) || []).filter((log) => {
+        const version = log.tag || log.hash;
+        return version !== (compare === null || compare === void 0 ? void 0 : compare.id.version);
+    }) || [];
+    const [tags, snaps] = (0, react_1.useMemo)(() => {
+        return (logs || []).reduce(([_tags, _snaps], log) => {
+            if (!log.tag) {
+                _snaps.push(Object.assign(Object.assign({}, log), { version: log.hash }));
+            }
+            else {
+                _tags.push(Object.assign(Object.assign({}, log), { version: log.tag }));
+            }
+            return [_tags, _snaps];
+        }, [new Array(), new Array()]);
+    }, [logs]);
+    const compareVersion = ((_b = componentCompare === null || componentCompare === void 0 ? void 0 : componentCompare.compare) === null || _b === void 0 ? void 0 : _b.hasLocalChanges) ? 'workspace' : compare === null || compare === void 0 ? void 0 : compare.version;
     const baseVersion = (_c = componentCompare === null || componentCompare === void 0 ? void 0 : componentCompare.base) === null || _c === void 0 ? void 0 : _c.model.version;
     const key = `base-compare-version-dropdown-${(_d = componentCompare === null || componentCompare === void 0 ? void 0 : componentCompare.compare) === null || _d === void 0 ? void 0 : _d.model.id.toString()}`;
     return (react_1.default.createElement("div", { className: component_compare_version_picker_module_scss_1.default.componentCompareVersionPicker },

package/dist/component-compare-version-picker.js.map

@@ -1 +1 @@
-{"version":3,"file":"component-compare-version-picker.js","sourceRoot":"","sources":["../component-compare-version-picker.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"component-compare-version-picker.js","sourceRoot":"","sources":["../component-compare-version-picker.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,26 +1,23 @@
 {
   "name": "@teambit/component.ui.component-compare.version-picker",
-  "version": "0.0.30",
+  "version": "0.0.31",
   "homepage": "https://bit.dev/teambit/component/ui/component-compare/version-picker",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "ui/component-compare/version-picker",
-    "version": "0.0.30"
+    "version": "0.0.31"
   },
   "dependencies": {
     "classnames": "2.2.6",
-    "lodash.compact": "3.0.1",
     "core-js": "^3.0.0",
     "@teambit/ui-foundation.ui.constants.z-indexes": "0.0.498",
     "@teambit/component.ui.component-compare.context": "0.0.6",
     "@teambit/component.ui.component-compare.hooks.use-component-compare-url": "0.0.2",
-    "@teambit/component.ui.version-dropdown": "0.0.712",
-    "@teambit/legacy-component-log": "0.0.399"
+    "@teambit/component.ui.version-dropdown": "0.0.713"
   },
   "devDependencies": {
     "@types/classnames": "2.2.11",
-    "@types/lodash.compact": "3.0.6",
     "@types/react": "^17.0.8",
     "@types/mocha": "9.1.0",
     "@types/node": "12.20.4",