fix: OPTIC-1178: Possible LS Memory Leak (#6704)

Co-authored-by: yyassi-heartex <[email protected]>
HumanSignal · Dec 18, 2024 · 3818a9c · 3818a9c
1 parent 2e360bc
commit 3818a9c
Show file tree

Hide file tree

Showing 25 changed files with 212 additions and 180 deletions.
diff --git a/web/libs/datamanager/src/components/App/App.jsx b/web/libs/datamanager/src/components/App/App.jsx
@@ -1,7 +1,8 @@
 import { observer, Provider } from "mobx-react";
 import React from "react";
+import clsx from "clsx";
 import { SDKProvider } from "../../providers/SDKProvider";
-import { Block, Elem } from "../../utils/bem";
+import { cn } from "../../utils/bem";
 import { Spinner } from "../Common/Spinner";
 import { DataManager } from "../DataManager/DataManager";
 import { Labeling } from "../Label/Label";
@@ -26,27 +27,32 @@ class ErrorBoundary extends React.Component {
  * @param {{app: import("../../stores/AppStore").AppStore} param0
  */
 const AppComponent = ({ app }) => {
+  const rootCN = cn("root");
+  const rootClassName = rootCN.mod({ mode: app.SDK.mode }).toString();
+  const crashCN = cn("crash");
   return (
     <ErrorBoundary>
       <Provider store={app}>
         <SDKProvider sdk={app.SDK}>
-          <Block name="root" mod={{ mode: app.SDK.mode }}>
+          <div className={rootClassName}>
             {app.crashed ? (
-              <Block name="crash">
-                <Elem name="header">Oops...</Elem>
-                <Elem name="description">Project has been deleted or not yet created.</Elem>
-              </Block>
+              <div className={clsx(rootCN.toString(), rootClassName)}>
+                <span className={rootCN.elem("header").toString()}>Oops...</span>
+                <span className={rootCN.elem("description").toString()}>
+                  Project has been deleted or not yet created.
+                </span>
+              </div>
             ) : app.loading ? (
-              <Block name="app-loader">
+              <div className={cn("app-loader").toString()}>
                 <Spinner size="large" />
-              </Block>
+              </div>
             ) : app.isLabeling ? (
               <Labeling />
             ) : (
               <DataManager />
             )}
-            <Block name={"offscreen"} />
-          </Block>
+            <div className={cn("offscreen").toString()} />
+          </div>
         </SDKProvider>
       </Provider>
     </ErrorBoundary>

diff --git a/web/libs/datamanager/src/components/CellViews/Agreement/Agreement.jsx b/web/libs/datamanager/src/components/CellViews/Agreement/Agreement.jsx
@@ -1,4 +1,5 @@
-import { Block, Elem } from "../../../utils/bem";
+import clsx from "clsx";
+import { cn } from "../../../utils/bem";
 import { isDefined } from "../../../utils/utils";
 import "./Agreement.scss";
 
@@ -19,12 +20,14 @@ const formatNumber = (num) => {
 };
 
 export const Agreement = (column) => {
+  const agreementCN = cn("agreement");
+  const scoreElem = agreementCN.elem("score");
   return (
-    <Block name="agreement">
-      <Elem name="score" mod={{ [agreement(column.value)]: true }}>
+    <div className={agreementCN.toString()}>
+      <span className={clsx(scoreElem.toString(), scoreElem.mod({ [agreement(column.value)]: true }).toString())}>
         {isDefined(column.value) ? `${formatNumber(column.value)}%` : ""}
-      </Elem>
-    </Block>
+      </span>
+    </div>
   );
 };
 

diff --git a/web/libs/datamanager/src/components/CellViews/Annotators/Annotators.jsx b/web/libs/datamanager/src/components/CellViews/Annotators/Annotators.jsx
@@ -1,7 +1,8 @@
 import { inject } from "mobx-react";
+import clsx from "clsx";
 import { LsCheckAlt, LsCrossAlt } from "../../../assets/icons";
 import { useSDK } from "../../../providers/SDKProvider";
-import { Block, Elem } from "../../../utils/bem";
+import { cn } from "../../../utils/bem";
 import { isDefined } from "../../../utils/utils";
 import { Space } from "../../Common/Space/Space";
 import { Tooltip } from "../../Common/Tooltip/Tooltip";
@@ -16,10 +17,12 @@ export const Annotators = (cell) => {
   const userList = Array.from(value);
   const renderable = userList.slice(0, 10);
   const extra = userList.length - renderable.length;
+  const userPickBadge = cn("userpic-badge");
+  const annotatorsCN = cn("annotators");
 
   return (
-    <Block name="annotators">
-      {renderable.map((item) => {
+    <div className={annotatorsCN.toString()}>
+      {renderable.map((item, index) => {
         const user = item.user ?? item;
         const { annotated, reviewed, review } = item;
 
@@ -28,9 +31,9 @@ export const Annotators = (cell) => {
         const suppressStats = column.alias === "comment_authors";
 
         return (
-          <Elem
-            key={`user-${user.id}`}
-            name="item"
+          <div
+            key={`user-${user.id}-${index}`}
+            className={annotatorsCN.elem("item").toString()}
             onClick={(e) => {
               e.preventDefault();
               e.stopPropagation();
@@ -43,29 +46,29 @@ export const Annotators = (cell) => {
                 faded={userpicIsFaded}
                 badge={{
                   bottomRight: review && (
-                    <Block name="userpic-badge" mod={{ [review]: true }}>
+                    <div className={clsx(userPickBadge.toString(), userPickBadge.mod({ [review]: true }).toString())}>
                       {review === "rejected" ? <LsCrossAlt /> : <LsCheckAlt />}
-                    </Block>
+                    </div>
                   ),
                 }}
               />
             </Tooltip>
-          </Elem>
+          </div>
         );
       })}
       {extra > 0 && (
-        <Elem
-          name="item"
+        <div
+          className={annotatorsCN.elem("item").toString()}
           onClick={(e) => {
             e.preventDefault();
             e.stopPropagation();
             sdk.invoke("userCellCounterClick", e, column.alias, task, userList);
           }}
         >
           <Userpic username={`+${extra}`} />
-        </Elem>
+        </div>
       )}
-    </Block>
+    </div>
   );
 };
 

diff --git a/web/libs/datamanager/src/components/Common/AnnotationPreview/AnnotationPreview.jsx b/web/libs/datamanager/src/components/Common/AnnotationPreview/AnnotationPreview.jsx
@@ -1,7 +1,7 @@
 import { inject, observer } from "mobx-react";
 import React from "react";
 import { taskToLSFormat } from "../../../sdk/lsf-utils";
-import { Block } from "../../../utils/bem";
+import { cn } from "../../../utils/bem";
 import { FF_LSDV_4711, isFF } from "../../../utils/feature-flags";
 import { Spinner } from "../Spinner";
 import "./AnnotationPreview.scss";
@@ -135,7 +135,7 @@ export const AnnotationPreview = injector(
         height={props.height}
       />
     ) : (
-      <Block name="annotation-preview" width={props.width} height={props.height}>
+      <div className={cn("annotation-preview").toString()} width={props.width} height={props.height}>
         <Spinner
           size={props.size ?? "default"}
           style={{
@@ -153,7 +153,7 @@ export const AnnotationPreview = injector(
           width={props.width}
           height={props.height}
         />
-      </Block>
+      </div>
     );
   }),
 );
diff --git a/web/libs/datamanager/src/components/Common/Dropdown/DropdownComponent.jsx b/web/libs/datamanager/src/components/Common/Dropdown/DropdownComponent.jsx
@@ -1,6 +1,7 @@
 import React from "react";
 import ReactDOM from "react-dom";
-import { Block, cn } from "../../../utils/bem";
+import clsx from "clsx";
+import { cn } from "../../../utils/bem";
 import { alignElements } from "../../../utils/dom";
 import { aroundTransition } from "../../../utils/transition";
 import "./Dropdown.scss";
@@ -151,17 +152,15 @@ export const Dropdown = React.forwardRef(({ animated = true, visible = false, ..
     ...(offset ?? {}),
     zIndex: 1000 + dropdownIndex,
   };
-
   const result = (
-    <Block
+    <div
       ref={dropdown}
-      name="dropdown-dm"
-      mix={[props.className, visibilityClasses]}
+      className={clsx(rootName.toString(), rootName.mix([props.className, visibilityClasses]).toString())}
       style={compositeStyles}
       onClick={(e) => e.stopPropagation()}
     >
       {content}
-    </Block>
+    </div>
   );
 
   return props.inline === true ? result : ReactDOM.createPortal(result, document.body);

diff --git a/web/libs/datamanager/src/components/Common/Form/Form.jsx b/web/libs/datamanager/src/components/Common/Form/Form.jsx
@@ -474,8 +474,9 @@ Form.Builder = forwardRef(
     };
 
     const renderColumns = (columns) => {
+      const columnClassName = cn("form-dm").elem("column").toString();
       return columns.map((col, index) => (
-        <div className={cn("form-dm").elem("column")} key={index} style={{ width: col.width }}>
+        <div className={columnClassName} key={index} style={{ width: col.width }}>
           {renderFields(col.fields)}
         </div>
       ));

diff --git a/web/libs/datamanager/src/components/Common/Icon/Icon.jsx b/web/libs/datamanager/src/components/Common/Icon/Icon.jsx
@@ -1,11 +1,11 @@
 import React from "react";
-import { Block } from "../../../utils/bem";
+import { cn } from "../../../utils/bem";
 import "./Icon.scss";
 
 export const Icon = React.forwardRef(({ icon, ...props }, ref) => {
   return (
-    <Block tag="span" name="icon" ref={ref}>
+    <span className={cn("icon").toString()} ref={ref}>
       {React.createElement(icon, props)}
-    </Block>
+    </span>
   );
 });
diff --git a/web/libs/datamanager/src/components/Common/Menu/Menu.jsx b/web/libs/datamanager/src/components/Common/Menu/Menu.jsx
@@ -1,10 +1,13 @@
 import React, { useCallback, useMemo } from "react";
-import { Block, cn } from "../../../utils/bem";
+import clsx from "clsx";
+import { cn } from "../../../utils/bem";
 import { useDropdown } from "../Dropdown/DropdownTrigger";
 import "./Menu.scss";
 import { MenuContext } from "./MenuContext";
 import { MenuItem } from "./MenuItem";
 
+const menuCN = cn("menu-dm");
+
 export const Menu = React.forwardRef(
   ({ children, className, style, size, selectedKeys, closeDropdownOnItemClick }, ref) => {
     const dropdown = useDropdown();
@@ -15,7 +18,7 @@ export const Menu = React.forwardRef(
 
     const clickHandler = useCallback(
       (e) => {
-        const elem = cn("menu-dm").elem("item").closest(e.target);
+        const elem = menuCN.elem("item").closest(e.target);
 
         if (dropdown && elem && closeDropdownOnItemClick !== false) {
           dropdown.close();
@@ -30,17 +33,14 @@ export const Menu = React.forwardRef(
 
     return (
       <MenuContext.Provider value={{ selected }}>
-        <Block
+        <ul
           ref={ref}
-          tag="ul"
-          name="menu-dm"
-          mod={{ size, collapsed }}
-          mix={className}
+          className={clsx(menuCN.toString(), menuCN.mod({ size, collapsed }).toString(), className)}
           style={style}
           onClick={clickHandler}
         >
           {children}
-        </Block>
+        </ul>
       </MenuContext.Provider>
     );
   },

diff --git a/web/libs/datamanager/src/components/Common/Table/Table.jsx b/web/libs/datamanager/src/components/Common/Table/Table.jsx
@@ -13,11 +13,11 @@ import { modal } from "../Modal/Modal";
 import { Tooltip } from "../Tooltip/Tooltip";
 import "./Table.scss";
 import { TableCheckboxCell } from "./TableCheckbox";
-import { TableBlock, TableContext, TableElem } from "./TableContext";
+import { tableCN, TableContext } from "./TableContext";
 import { TableHead } from "./TableHead/TableHead";
 import { TableRow } from "./TableRow/TableRow";
 import { prepareColumns } from "./utils";
-import { Block } from "../../../utils/bem";
+import { cn } from "../../../utils/bem";
 import { FieldsButton } from "../FieldsButton";
 import { LsGear, LsGearNewUI } from "../../../assets/icons";
 import { FF_DEV_3873, FF_LOPS_E_10, FF_LOPS_E_3, isFF } from "../../../utils/feature-flags";
@@ -285,18 +285,19 @@ export const Table = observer(
       tableWrapper.current?.firstChild?.firstChild.offsetWidth -
         tableWrapper.current?.firstChild?.firstChild?.firstChild.offsetWidth || 0;
 
+    const columnsSelectorCN = cn("columns__selector");
     return (
       <>
         {view.root.isLabeling && (
-          <Block
-            name="columns__selector"
+          <div
+            className={columnsSelectorCN.toString()}
             style={{
               right,
             }}
           >
             {isFF(FF_DEV_3873) ? (
               <FieldsButton
-                className={"columns__selector__button-new"}
+                className={columnsSelectorCN.elem("button-new").toString()}
                 wrapper={FieldsButton.Checkbox}
                 icon={<LsGearNewUI />}
                 style={{ padding: "0" }}
@@ -316,9 +317,9 @@ export const Table = observer(
                 }}
               />
             )}
-          </Block>
+          </div>
         )}
-        <TableBlock ref={tableWrapper} name="table" mod={{ fit: props.fitToContent }}>
+        <div ref={tableWrapper} className={tableCN.mod({ fit: props.fitToContent }).toString()}>
           <TableContext.Provider value={contextValue}>
             <StickyList
               ref={listRef}
@@ -338,7 +339,7 @@ export const Table = observer(
               {renderRow}
             </StickyList>
           </TableContext.Provider>
-        </TableBlock>
+        </div>
       </>
     );
   },
@@ -388,7 +389,7 @@ const StickyList = observer(
 
     return (
       <StickyListContext.Provider value={itemData}>
-        <TableElem tag={AutoSizer} name="auto-size">
+        <AutoSizer className={tableCN.elem("auto-size")}>
           {({ width, height }) => (
             <InfiniteLoader
               ref={listRef}
@@ -399,9 +400,8 @@ const StickyList = observer(
               minimumBatchSize={30}
             >
               {({ onItemsRendered, ref }) => (
-                <TableElem
-                  name="virual"
-                  tag={VariableSizeList}
+                <VariableSizeList
+                  className={tableCN.elem("virual").toString()}
                   {...rest}
                   ref={ref}
                   width={width}
@@ -412,11 +412,11 @@ const StickyList = observer(
                   initialScrollOffset={initialScrollOffset?.(height) ?? 0}
                 >
                   {ItemWrapper}
-                </TableElem>
+                </VariableSizeList>
               )}
             </InfiniteLoader>
           )}
-        </TableElem>
+        </AutoSizer>
       </StickyListContext.Provider>
     );
   }),
@@ -430,9 +430,8 @@ const innerElementType = forwardRef(({ children, ...rest }, ref) => {
       {({ stickyItems, stickyItemsHeight, StickyComponent }) => (
         <div ref={ref} {...rest}>
           {stickyItems.map((index) => (
-            <TableElem
-              name="sticky-header"
-              tag={StickyComponent}
+            <StickyComponent
+              className={tableCN.elem("sticky-header").toString()}
               key={index}
               index={index}
               style={{