Explorar el Código

Improve display of the instance name in tasks

If the instance name is a path (contains `/`), the last part of the path
is displayed as the instance name label in replica execution tasks.

Also, an HTML tooltip is displayed on label hover.
Sergiu Miclea hace 3 años
padre
commit
ae40ff5370
Se han modificado 1 ficheros con 8 adiciones y 2 borrados
  1. 8 2
      src/components/modules/TransferModule/TaskItem/TaskItem.tsx

+ 8 - 2
src/components/modules/TransferModule/TaskItem/TaskItem.tsx

@@ -241,9 +241,15 @@ class TaskItem extends React.Component<Props> {
     const instance = this.props.instancesDetails.find(
     const instance = this.props.instancesDetails.find(
       i => i.id === this.props.item.instance
       i => i.id === this.props.item.instance
     );
     );
-    const instanceLabel =
+    const instanceName =
       instance?.instance_name || instance?.name || this.props.item.instance;
       instance?.instance_name || instance?.name || this.props.item.instance;
 
 
+    // get the last '/' path from instance name
+    const instanceLabel =
+      instanceName.indexOf("/") > -1
+        ? `.../${instanceName.substring(instanceName.lastIndexOf("/") + 1)}`
+        : instanceName;
+
     return (
     return (
       <Header>
       <Header>
         <HeaderData capitalize width={this.props.columnWidths[0]} black>
         <HeaderData capitalize width={this.props.columnWidths[0]} black>
@@ -257,7 +263,7 @@ class TaskItem extends React.Component<Props> {
             </TitleText>
             </TitleText>
           </Title>
           </Title>
         </HeaderData>
         </HeaderData>
-        <HeaderData title={instanceLabel} width={this.props.columnWidths[1]}>
+        <HeaderData title={instanceName} width={this.props.columnWidths[1]}>
           {instanceLabel}
           {instanceLabel}
         </HeaderData>
         </HeaderData>
         <HeaderData width={this.props.columnWidths[2]}>
         <HeaderData width={this.props.columnWidths[2]}>