Merge pull request #3944 from dlabrecq/ocp-projects

OCP unallocated and unattributed projects should be exportable

Author: dlabrecq

src/routes/components/dataToolbar/dataToolbar.styles.ts

@@ -11,4 +11,7 @@ export const styles = {
     paddingBottom: global_spacer_md.value,
     paddingTop: global_spacer_md.value,
   },
+  platformCosts: {
+    marginTop: '6px',
+  },
 } as { [className: string]: React.CSSProperties };

src/routes/components/dataToolbar/utils/actions.tsx

@@ -3,6 +3,7 @@ import { ExportIcon } from '@patternfly/react-icons/dist/esm/icons/export-icon';
 import { intl } from 'components/i18n';
 import messages from 'locales/messages';
 import React from 'react';
+import { styles } from 'routes/components/dataToolbar/dataToolbar.styles';
 import { DropdownWrapper } from 'routes/components/dropdownWrapper';
 
 // Column management
@@ -64,7 +65,10 @@ export const getPlatformCosts = ({
   onPlatformCostsChanged?: (checked: boolean) => void;
 }) => {
   return (
-    <ToolbarItem visibility={{ default: 'hidden', '2xl': 'visible', xl: 'visible', lg: 'hidden' }}>
+    <ToolbarItem
+      visibility={{ default: 'hidden', '2xl': 'visible', xl: 'visible', lg: 'hidden' }}
+      style={styles.platformCosts}
+    >
       <Switch
         id="platform-costs"
         label={intl.formatMessage(messages.sumPlatformCosts)}

src/routes/details/ocpDetails/detailsTable.tsx

@@ -226,14 +226,11 @@ class DetailsTableBase extends React.Component<DetailsTableProps, DetailsTableSt
         ((item.cost.platformDistributed && item.cost.platformDistributed.value > 0) ||
           (item.cost.workerUnallocatedDistributed && item.cost.workerUnallocatedDistributed.value > 0));
       const desc = item.id && item.id !== item.label ? <div style={styles.infoDescription}>{item.id}</div> : null;
-      const isDisabled =
-        label === `${noPrefix}${groupBy}` ||
-        label === `${noPrefix}${groupByTagKey}` ||
-        isUnallocatedProject ||
-        isUnattributedCosts;
+      const isDisabled = label === `${noPrefix}${groupBy}` || label === `${noPrefix}${groupByTagKey}`;
+      const isLinkDisabled = isDisabled || isUnallocatedProject || isUnattributedCosts;
       const actions = this.getActions(item, isDisabled);
 
-      const name = isDisabled ? (
+      const name = isLinkDisabled ? (
         (label as any)
       ) : (
         <Link