Change: Replace withUserName HOC by useUserName hook

Use more modern react. Hooks are easier to understand then HOCs.
greenbone · Mar 6, 2025 · f26ee10 · f26ee10
1 parent d9ccc42
commit f26ee10
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 42 deletions.
diff --git a/src/web/entities/EntityNameTableData.jsx b/src/web/entities/EntityNameTableData.jsx
@@ -13,60 +13,60 @@ import DetailsLink from 'web/components/link/DetailsLink';
 import TableData from 'web/components/table/Data';
 import {RowDetailsToggle} from 'web/entities/Row';
 import ObserverIcon from 'web/entity/icon/ObserverIcon';
+import useUserName from 'web/hooks/useUserName';
 import PropTypes from 'web/utils/PropTypes';
-import withUsername from 'web/utils/withUserName';
-
 
 const EntityNameTableData = ({
   entity,
   links = true,
   displayName,
-  username,
   type = getEntityType(entity),
   children,
   onToggleDetailsClick,
-}) => (
-  <TableData>
-    <Layout align={'space-between'} columns={2}>
-      <div>
-        {entity.isOrphan() && <b>{_('Orphan')}</b>}
-        {isDefined(onToggleDetailsClick) ? (
-          <span>
-            <RowDetailsToggle name={entity.id} onClick={onToggleDetailsClick}>
-              {entity.name}
-            </RowDetailsToggle>
-            {entity.deprecated && <b> ({_('Deprecated')})</b>}
-          </span>
-        ) : (
-          <span>
-            <DetailsLink id={entity.id} textOnly={!links} type={type}>
-              {entity.name}
-            </DetailsLink>
-            {entity.deprecated && <b> ({_('Deprecated')})</b>}
-          </span>
-        )}
-        {isDefined(entity.comment) && <Comment>({entity.comment})</Comment>}
-        {children}
-      </div>
-      <Layout>
-        <ObserverIcon
-          displayName={displayName}
-          entity={entity}
-          userName={username}
-        />
+}) => {
+  const [username] = useUserName();
+  return (
+    <TableData>
+      <Layout align={'space-between'} columns={2}>
+        <div>
+          {entity.isOrphan() && <b>{_('Orphan')}</b>}
+          {isDefined(onToggleDetailsClick) ? (
+            <span>
+              <RowDetailsToggle name={entity.id} onClick={onToggleDetailsClick}>
+                {entity.name}
+              </RowDetailsToggle>
+              {entity.deprecated && <b> ({_('Deprecated')})</b>}
+            </span>
+          ) : (
+            <span>
+              <DetailsLink id={entity.id} textOnly={!links} type={type}>
+                {entity.name}
+              </DetailsLink>
+              {entity.deprecated && <b> ({_('Deprecated')})</b>}
+            </span>
+          )}
+          {isDefined(entity.comment) && <Comment>({entity.comment})</Comment>}
+          {children}
+        </div>
+        <Layout>
+          <ObserverIcon
+            displayName={displayName}
+            entity={entity}
+            userName={username}
+          />
+        </Layout>
       </Layout>
-    </Layout>
-  </TableData>
-);
+    </TableData>
+  );
+};
 
 EntityNameTableData.propTypes = {
   children: PropTypes.node,
   displayName: PropTypes.string.isRequired,
   entity: PropTypes.model.isRequired,
   links: PropTypes.bool,
   type: PropTypes.string,
-  username: PropTypes.string.isRequired,
   onToggleDetailsClick: PropTypes.func,
 };
 
-export default withUsername(EntityNameTableData);
+export default EntityNameTableData;
diff --git a/src/web/pages/audits/Row.jsx b/src/web/pages/audits/Row.jsx
@@ -20,11 +20,10 @@ import TableData from 'web/components/table/Data';
 import TableRow from 'web/components/table/Row';
 import {RowDetailsToggle} from 'web/entities/Row';
 import ObserverIcon from 'web/entity/icon/ObserverIcon';
+import useUserName from 'web/hooks/useUserName';
 import Actions from 'web/pages/audits/Actions';
 import AuditStatus from 'web/pages/tasks/Status';
 import PropTypes from 'web/utils/PropTypes';
-import withUserName from 'web/utils/withUserName';
-
 
 const renderAuditReport = (report, links) => {
   if (!isDefined(report)) {
@@ -65,10 +64,10 @@ const Row = ({
   actionsComponent: ActionsComponent = Actions,
   entity,
   links = true,
-  username,
   onToggleDetailsClick,
   ...props
 }) => {
+  const [username] = useUserName();
   const {scanner, observers} = entity;
   const obs = [];
 
@@ -148,8 +147,7 @@ Row.propTypes = {
   actionsComponent: PropTypes.component,
   entity: PropTypes.model.isRequired,
   links: PropTypes.bool,
-  username: PropTypes.string.isRequired,
   onToggleDetailsClick: PropTypes.func.isRequired,
 };
 
-export default withUserName(Row);
+export default Row;