Merge pull request #3350 from dlabrecq/source_type

Source type
project-koku · Aug 18, 2023 · 10f8b36 · 10f8b36
2 parents c8deea4 + 1ae3ce8
commit 10f8b36
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 14 deletions.
diff --git a/locales/data.json b/locales/data.json
@@ -9609,6 +9609,12 @@
         "value": "Infrastructure"
       }
     ],
+    "lastProcessed": [
+      {
+        "type": 0,
+        "value": "Last processed"
+      }
+    ],
     "learnMore": [
       {
         "type": 0,

diff --git a/locales/translations.json b/locales/translations.json
@@ -334,6 +334,7 @@
   "inactiveSourcesTitle": "A problem was detected with {value}",
   "inactiveSourcesTitleMultiplier": "A problem was detected with the following sources",
   "infrastructure": "Infrastructure",
+  "lastProcessed": "Last processed",
   "learnMore": "Learn more",
   "limits": "Limits",
   "loadingStateDesc": "Searching for your sources. Do not refresh the browser",

diff --git a/src/api/costModels.ts b/src/api/costModels.ts
@@ -5,6 +5,7 @@ import type { Rate, RateRequest } from './rates';
 
 export interface CostModelProvider {
   name: string;
+  last_processed?: string;
   uuid: string;
 }
 

diff --git a/src/components/featureFlags/featureFlags.tsx b/src/components/featureFlags/featureFlags.tsx
@@ -1,3 +1,4 @@
+import { useChrome } from '@redhat-cloud-services/frontend-components/useChrome';
 import { useUnleashClient, useUnleashContext } from '@unleash/proxy-client-react';
 import { useLayoutEffect, useRef } from 'react';
 import { useDispatch } from 'react-redux';
@@ -21,14 +22,12 @@ const useFeatureFlags = () => {
   const updateContext = useUnleashContext();
   const client = useUnleashClient();
   const dispatch = useDispatch();
+  const { auth } = useChrome();
 
   const fetchUser = callback => {
-    const insights = (window as any).insights;
-    if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
-      insights.chrome.auth.getUser().then(user => {
-        callback(user.identity.account_number);
-      });
-    }
+    auth.getUser().then(user => {
+      callback((user as any).identity.account_number);
+    });
   };
 
   const isMounted = useRef(false);

diff --git a/src/locales/messages.ts b/src/locales/messages.ts
@@ -2174,6 +2174,11 @@ export default defineMessages({
     description: 'Infrastructure',
     id: 'infrastructure',
   },
+  lastProcessed: {
+    defaultMessage: 'Last processed',
+    description: 'Last processed',
+    id: 'lastProcessed',
+  },
   learnMore: {
     defaultMessage: 'Learn more',
     description: 'Learn more',

diff --git a/src/routes/settings/costModels/costModel/sourcesTable.tsx b/src/routes/settings/costModels/costModel/sourcesTable.tsx
@@ -25,7 +25,7 @@ interface SourcesTableStateProps {
 type SourcesTableProps = SourcesTableOwnProps & SourcesTableStateProps & WrappedComponentProps;
 
 const SourcesTable: React.FC<SourcesTableProps> = ({ canWrite, costModels, intl, showDeleteDialog }) => {
-  const rows: (IRow | string[])[] = costModels.length > 0 ? costModels[0].sources.map(source => [source.name]) : [];
+  const rows: (IRow | string[])[] = costModels.length > 0 ? costModels[0].sources : [];
 
   return (
     <TableComposable
@@ -36,13 +36,26 @@ const SourcesTable: React.FC<SourcesTableProps> = ({ canWrite, costModels, intl,
       <Thead>
         <Tr>
           <Th>{intl.formatMessage(messages.names, { count: 1 })}</Th>
+          <Th>{intl.formatMessage(messages.lastProcessed)}</Th>
           <Th></Th>
         </Tr>
       </Thead>
       <Tbody>
-        {rows.map((r: any, rowIndex) => (
+        {rows.map((row: any, rowIndex) => (
           <Tr key={rowIndex}>
-            <Td>{r}</Td>
+            <Td>{row.name}</Td>
+            <Td>
+              {intl.formatDate(row.last_processed, {
+                day: 'numeric',
+                hour: 'numeric',
+                hour12: false,
+                minute: 'numeric',
+                month: 'short',
+                timeZone: 'UTC',
+                timeZoneName: 'short',
+                year: 'numeric',
+              })}
+            </Td>
             <Td isActionCell>
               <ReadOnlyTooltip key="action" isDisabled={!canWrite}>
                 <Button

diff --git a/src/routes/settings/tagDetails/tagTable.tsx b/src/routes/settings/tagDetails/tagTable.tsx
@@ -74,7 +74,7 @@ class TagTableBase extends React.Component<TagTableProps, TagTableState> {
         ...(tags.length && { isSortable: true }),
       },
       {
-        orderBy: 'provider_type',
+        orderBy: 'source_type',
         name: intl.formatMessage(messages.sourceType),
         ...(tags.length && { isSortable: true }),
       },
@@ -95,7 +95,7 @@ class TagTableBase extends React.Component<TagTableProps, TagTableState> {
             ),
           },
           {
-            value: intl.formatMessage(messages.sourceTypes, { value: item.provider_type.toLowerCase() }),
+            value: intl.formatMessage(messages.sourceTypes, { value: item?.source_type?.toLowerCase() }),
           },
         ],
         item,

diff --git a/src/routes/settings/tagDetails/tagToolbar.tsx b/src/routes/settings/tagDetails/tagToolbar.tsx
@@ -109,9 +109,7 @@ export class TagToolbarBase extends React.Component<TagToolbarProps, TagToolbarS
         name: intl.formatMessage(messages.filterByValues, { value: 'name' }),
       },
       {
-        ariaLabelKey: 'source_type',
-        placeholderKey: 'source_type',
-        key: 'provider_type',
+        key: 'source_type',
         name: intl.formatMessage(messages.filterByValues, { value: 'source_type' }),
         selectClassName: 'selectOverride', // A selector from routes/components/dataToolbar/dataToolbar.scss
         selectOptions: [