[release-4.7] Bug 2052859: override normal namespace hiding for pods view in node details

frontend/packages/console-app/src/components/nodes/NodeDetailsPage.tsx

@@ -30,7 +30,11 @@ const NodeDetailsPage: React.FC<React.ComponentProps<typeof DetailsPage>> = (pro
       },
       editYaml(),
       pods(({ obj }) => (
-        <PodsPage showTitle={false} fieldSelector={`spec.nodeName=${obj.metadata.name}`} />
+        <PodsPage
+          showTitle={false}
+          fieldSelector={`spec.nodeName=${obj.metadata.name}`}
+          customData={{ showNamespaceOverride: true }}
+        />
       )),
       events(ResourceEventStream),
       ...(!_.some(

frontend/packages/console-app/src/components/nodes/NodesPage.tsx

@@ -425,6 +425,7 @@ const NodesTable: React.FC<NodesTableProps &
         activeColumns={selectedColumns}
         columnManagementID={columnManagementID}
         aria-label={t('nodes~Nodes')}
+        showNamespaceOverride
         Header={NodeTableHeader}
         Row={Row}
         virtualize

frontend/public/components/factory/table.tsx

@@ -305,9 +305,15 @@ const MAX_COL_MD = 4;
 const MAX_COL_LG = 6;
 const MAX_COL_XL = 8;
 
-const isColumnVisible = (columnID: string, columns: Set<string> = new Set()) => {
+const isColumnVisible = (
+  columnID: string,
+  columns: Set<string> = new Set(),
+  showNamespaceOverride,
+) => {
   const showNamespace =
-    columnID !== 'namespace' || UIActions.getActiveNamespace() === ALL_NAMESPACES_KEY;
+    columnID !== 'namespace' ||
+    UIActions.getActiveNamespace() === ALL_NAMESPACES_KEY ||
+    showNamespaceOverride;
   if (_.isEmpty(columns) && showNamespace) {
     return true;
   }
@@ -338,9 +344,10 @@ export const TableData: React.SFC<TableDataProps> = ({
   className,
   columnID,
   columns,
+  showNamespaceOverride,
   ...props
 }) => {
-  return isColumnVisible(columnID, columns) ? (
+  return isColumnVisible(columnID, columns, showNamespaceOverride) ? (
     <td {...props} className={className} role="gridcell" />
   ) : null;
 };
@@ -350,6 +357,7 @@ export type TableDataProps = {
   columnID?: string;
   columns?: Set<string>;
   id?: string;
+  showNamespaceOverride?: boolean;
 };
 
 const TableWrapper: React.SFC<TableWrapperProps> = ({
@@ -471,6 +479,7 @@ export type TableProps = {
   defaultSortFunc?: string;
   defaultSortField?: string;
   defaultSortOrder?: SortByDirection;
+  showNamespaceOverride?: boolean;
   filters?: { [key: string]: any };
   Header: (...args) => any[];
   loadError?: string | Object;
@@ -514,6 +523,7 @@ const getActiveColumns = (
   componentProps: ComponentProps,
   activeColumns: Set<string>,
   columnManagementID: string,
+  showNamespaceOverride: boolean,
 ) => {
   let columns = Header(componentProps);
   if (_.isEmpty(activeColumns)) {
@@ -526,12 +536,15 @@ const getActiveColumns = (
     );
   }
   if (columnManagementID) {
-    columns = columns?.filter((col) => isColumnVisible(col.id, activeColumns) || col.title === '');
+    columns = columns?.filter(
+      (col) => isColumnVisible(col.id, activeColumns, showNamespaceOverride) || col.title === '',
+    );
   } else {
     columns = columns?.filter((col) => activeColumns.has(col.id) || col.title === '');
   }
 
-  const showNamespace = UIActions.getActiveNamespace() === ALL_NAMESPACES_KEY;
+  const showNamespace =
+    UIActions.getActiveNamespace() === ALL_NAMESPACES_KEY || showNamespaceOverride;
   if (!showNamespace) {
     columns = columns.filter((column) => column.id !== 'namespace');
   }
@@ -551,6 +564,7 @@ export const Table = connect<
       static propTypes = {
         customData: PropTypes.any,
         data: PropTypes.array,
+        showNamespaceOverride: PropTypes.bool,
         unfilteredData: PropTypes.array,
         NoDataEmptyMsg: PropTypes.func,
         EmptyMsg: PropTypes.func,
@@ -597,6 +611,7 @@ export const Table = connect<
           componentProps,
           this.props.activeColumns,
           this.props.columnManagementID,
+          this.props.showNamespaceOverride,
         );
         const { currentSortField, currentSortFunc, currentSortOrder } = props;
 
@@ -638,6 +653,7 @@ export const Table = connect<
           componentProps,
           this.props.activeColumns,
           this.props.columnManagementID,
+          this.props.showNamespaceOverride,
         );
         const sp = new URLSearchParams(window.location.search);
         const columnIndex = _.findIndex(columns, { title: sp.get('sortBy') });
@@ -686,6 +702,7 @@ export const Table = connect<
           componentProps,
           this.props.activeColumns,
           this.props.columnManagementID,
+          this.props.showNamespaceOverride,
         );
         const sortColumn = columns[index - this._columnShift];
         this._applySort(sortColumn.sortField, sortColumn.sortFunc, direction, sortColumn.title);
@@ -714,6 +731,7 @@ export const Table = connect<
           gridBreakPoint = TableGridBreakpoint.none,
           Header,
           activeColumns,
+          showNamespaceOverride,
         } = this.props;
         const { sortBy } = this.state;
         const componentProps: any = _.pick(this.props, [
@@ -723,7 +741,13 @@ export const Table = connect<
           'match',
           'kindObj',
         ]);
-        const columns = getActiveColumns(Header, componentProps, activeColumns, columnManagementID);
+        const columns = getActiveColumns(
+          Header,
+          componentProps,
+          activeColumns,
+          columnManagementID,
+          showNamespaceOverride,
+        );
         const ariaRowCount = componentProps.data && componentProps.data.length;
         const scrollNode = typeof scrollElement === 'function' ? scrollElement() : scrollElement;
         const renderVirtualizedTable = (scrollContainer) => (
@@ -803,6 +827,7 @@ export type TableInnerProps = {
   data?: any[];
   defaultSortField?: string;
   defaultSortFunc?: string;
+  showNamespaceOverride?: boolean;
   activeColumns?: Set<string>;
   unfilteredData?: any[];
   NoDataEmptyMsg?: React.ComponentType<{}>;

frontend/public/components/modals/column-management-modal.tsx

@@ -118,7 +118,8 @@ export const ColumnManagementModal: React.FC<ColumnManagementModalProps &
             title={t('modal~You can select up to {{MAX_VIEW_COLS}} columns', { MAX_VIEW_COLS })}
             variant="info"
           >
-            {t('modal~The namespace column is only shown when in "All projects"')}
+            {!columnLayout?.showNamespaceOverride &&
+              t('modal~The namespace column is only shown when in "All projects"')}
           </Alert>
         </div>
         <div className="row co-m-form-row">
@@ -206,6 +207,7 @@ export type ColumnLayout = {
   id: string;
   columns: ManagedColumn[];
   selectedColumns: Set<string>;
+  showNamespaceOverride?: boolean;
   type: string;
 };
 

frontend/public/components/pod.tsx

@@ -311,6 +311,7 @@ const PodTableRow = connect<PodTableRowPropsFromState, null, PodTableRowProps>(p
     style,
     metrics,
     showNodes,
+    showNamespaceOverride,
   }: PodTableRowProps & PodTableRowPropsFromState) => {
     const [tableColumns, , loaded] = useUserSettingsCompatibility(
       COLUMN_MANAGEMENT_CONFIGMAP_KEY,
@@ -337,6 +338,7 @@ const PodTableRow = connect<PodTableRowPropsFromState, null, PodTableRowProps>(p
           className={classNames(podColumnInfo.namespace.classes, 'co-break-word')}
           columns={columns}
           columnID={podColumnInfo.namespace.id}
+          showNamespaceOverride={showNamespaceOverride}
         >
           <ResourceLink kind="Namespace" name={namespace} />
         </TableData>
@@ -791,14 +793,15 @@ export const PodsDetailsPage: React.FC<PodDetailsPageProps> = (props) => {
 };
 PodsDetailsPage.displayName = 'PodsDetailsPage';
 
-const getRow = (showNodes) => {
+const getRow = (showNodes, showNamespaceOverride) => {
   return (rowArgs: RowFunctionArgs<PodKind>) => (
     <PodTableRow
       obj={rowArgs.obj}
       index={rowArgs.index}
       rowKey={rowArgs.key}
       style={rowArgs.style}
       showNodes={showNodes}
+      showNamespaceOverride={showNamespaceOverride}
     />
   );
 };
@@ -813,6 +816,7 @@ export const PodList: React.FC<PodListProps> = withUserSettingsCompatibility<
   true,
 )(({ userSettingState: tableColumns, ...props }) => {
   const showNodes = props?.customData?.showNodes;
+  const showNamespaceOverride = props?.customData?.showNamespaceOverride;
   const { t } = useTranslation();
   const selectedColumns: Set<string> =
     tableColumns?.[columnManagementID]?.length > 0
@@ -823,9 +827,10 @@ export const PodList: React.FC<PodListProps> = withUserSettingsCompatibility<
       {...props}
       activeColumns={selectedColumns}
       columnManagementID={columnManagementID}
+      showNamespaceOverride={showNamespaceOverride}
       aria-label={t('public~Pods')}
       Header={getHeader(showNodes)}
-      Row={getRow(showNodes)}
+      Row={getRow(showNodes, showNamespaceOverride)}
       virtualize
     />
   );
@@ -920,6 +925,7 @@ export const PodsPage = connect<{}, PodPagePropsFromDispatch, PodPageProps>(
               tableColumns?.[columnManagementID]?.length > 0
                 ? new Set(tableColumns[columnManagementID])
                 : null,
+            showNamespaceOverride: props?.customData?.showNamespaceOverride,
             type: t('public~Pod'),
           }}
         />
@@ -977,6 +983,7 @@ type PodTableRowProps = {
   rowKey: string;
   style: object;
   showNodes?: boolean;
+  showNamespaceOverride?: boolean;
 };
 
 type PodTableRowPropsFromState = {