(fix) O3-4416 Remove duplicated tag definition in QueuePriority compo…

…nent
openmrs · Nov 22, 2024 · 5901211 · 5901211
1 parent 008f371
commit 5901211
Showing 1 changed file with 16 additions and 19 deletions.
diff --git a/...ages/esm-service-queues-app/src/queue-entry-table-components/queue-priority.component.tsx b/...ages/esm-service-queues-app/src/queue-entry-table-components/queue-priority.component.tsx
@@ -13,31 +13,28 @@ interface QueuePriorityProps {
 
 const QueuePriority: React.FC<QueuePriorityProps> = ({ priority, priorityComment, priorityConfigs }) => {
   const priorityConfig = priorityConfigs.find((c) => c.conceptUuid === priority.uuid);
+
+  let tag = (
+    <Tag
+      role={priorityComment ? 'tooltip' : null}
+      className={classNames(
+        styles.tag,
+        priorityConfig?.style === 'bold' && styles.bold,
+        priorityConfig?.color === 'orange' && styles.orange,
+      )}
+      type={priorityConfig?.color !== 'orange' ? priorityConfig?.color : null}>
+      {priority.display}
+    </Tag>
+  );
+
   return (
     <>
       {priorityComment ? (
         <DefinitionTooltip className={styles.tooltip} align="bottom-left" definition={priorityComment}>
-          <Tag
-            role="tooltip"
-            className={classNames(
-              styles.tag,
-              priorityConfig?.style === 'bold' && styles.bold,
-              priorityConfig?.color === 'orange' && styles.orange,
-            )}
-            type={priorityConfig?.color !== 'orange' ? priorityConfig?.color : null}>
-            {priority.display}
-          </Tag>
+          {tag}
         </DefinitionTooltip>
       ) : (
-        <Tag
-          className={classNames(
-            styles.tag,
-            priorityConfig?.style === 'bold' && styles.bold,
-            priorityConfig?.color === 'orange' && styles.orange,
-          )}
-          type={priorityConfig?.color !== 'orange' ? priorityConfig?.color : null}>
-          {priority.display}
-        </Tag>
+        tag
       )}
     </>
   );