Merge pull request #2133 from glific/bug/flow-name-undefined

Fixed flow name undefined and removal of extra isActive column
glific · Aug 26, 2022 · 1bf943d · 1bf943d
2 parents 82e2e25 + 68d974c
commit 1bf943d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/components/UI/Pager/Pager.tsx b/src/components/UI/Pager/Pager.tsx
@@ -14,6 +14,7 @@ import {
 import { setColumnToBackendTerms } from 'common/constants';
 import styles from './Pager.module.css';
 
+const removeDisplayColumns = ['recordId', 'translations', 'id', 'isActive'];
 interface PagerProps {
   columnNames: Array<any>;
   removeSortBy: Array<any>;
@@ -83,7 +84,7 @@ const createRows = (
     let stylesIndex = -1;
     return Object.keys(entry).map((item: any) => {
       // let's not display recordId in the UI
-      if (item === 'recordId' || item === 'translations' || item === 'id') {
+      if (removeDisplayColumns.includes(item)) {
         return null;
       }
       // maintain columnStyles index

diff --git a/src/containers/List/List.tsx b/src/containers/List/List.tsx
@@ -381,7 +381,11 @@ export const List: React.SFC<ListProps> = ({
     // currently we don't allow edit or delete for reserved items. hence return early
     const { id, label, name, isReserved } = item;
 
-    const labelValue = label !== null ? label : name;
+    let labelValue = label;
+
+    if (name) {
+      labelValue = name;
+    }
 
     if (isReserved) {
       return null;