Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/prod-beta' into prod-stable
Browse files Browse the repository at this point in the history
  • Loading branch information
dlabrecq committed Oct 18, 2022
2 parents dbbde26 + 179ca02 commit c3d7bc1
Show file tree
Hide file tree
Showing 1,124 changed files with 48,656 additions and 9,721 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ import { Skeleton, Title } from '@patternfly/react-core';
import { getQuery, Query } from 'api/queries/query';
import { Report, ReportPathsType, ReportType } from 'api/reports/report';
import { AxiosError } from 'axios';
import React from 'react';
import { connect } from 'react-redux';
import {
ChartType,
ComputedReportItemType,
ComputedReportItemValueType,
DatumType,
transformReport,
} from 'pages/views/components/charts/common/chartDatumUtils';
import { TrendChart } from 'pages/views/components/charts/trendChart';
import React from 'react';
import { connect } from 'react-redux';
} from 'routes/views/components/charts/common/chartDatum';
import { TrendChart } from 'routes/views/components/charts/trendChart';
import { createMapStateToProps, FetchStatus } from 'store/common';
import { reportActions, reportSelectors } from 'store/reports';
import { unitsLookupKey } from 'utils/format';
Expand All @@ -20,6 +20,7 @@ import { skeletonWidth } from 'utils/skeleton';
import { chartStyles, styles } from './ocpOverviewChart.styles';

interface OcpOverviewChartOwnProps {
chartName: string;
computedReportItemType?: ComputedReportItemType;
title?: string; // This is just a test property
}
Expand Down Expand Up @@ -84,19 +85,19 @@ class OcpOverviewChartBase extends React.Component<OcpOverviewChartProps> {
}

private getChart = () => {
const { currentReport, previousReport } = this.props;
const { chartName, currentReport, previousReport } = this.props;
const units = this.getUnits();

const currentData = transformReport(
currentReport,
ChartType.rolling,
DatumType.cumulative,
'date',
computedReportItem,
computedReportItemValue
);
const previousData = transformReport(
previousReport,
ChartType.rolling,
DatumType.cumulative,
'date',
computedReportItem,
computedReportItemValue
Expand All @@ -109,6 +110,7 @@ class OcpOverviewChartBase extends React.Component<OcpOverviewChartProps> {
currentData={currentData}
formatter={formatUnits}
height={chartStyles.chartHeight}
name={chartName}
previousData={previousData}
units={units}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import { getQuery, parseQuery, Query } from 'api/queries/query';
import { getUserAccessQuery } from 'api/queries/userAccessQuery';
import { UserAccess, UserAccessType } from 'api/userAccess';
import { AxiosError } from 'axios';
import Loading from 'pages/state/loading';
import NoData from 'pages/state/noData';
import NoProviders from 'pages/state/noProviders';
import NotAvailable from 'pages/state/notAvailable';
import { hasCurrentMonthData, hasPreviousMonthData } from 'pages/views/utils/providers';
import React from 'react';
import { connect } from 'react-redux';
import { Loading } from 'routes/state/loading';
import { NoData } from 'routes/state/noData';
import { NoProviders } from 'routes/state/noProviders';
import { NotAvailable } from 'routes/state/notAvailable';
import { hasCurrentMonthData, hasPreviousMonthData } from 'routes/views/utils/providers';
import { createMapStateToProps, FetchStatus } from 'store/common';
import { ocpProvidersQuery, providersActions, providersSelectors } from 'store/providers';
import { userAccessActions, userAccessQuery, userAccessSelectors } from 'store/userAccess';
Expand All @@ -20,10 +20,12 @@ import { baseQuery, isOcpAvailable } from './ocpOverviewUtils';
import { styles } from './ocpOverviewWidget.styles';

interface OcpOverviewWidgetOwnProps {
chartName: string;
title?: string; // This is just a test property
}

interface OcpOverviewWidgetStateProps {
chartName?: string;
providers: Providers;
providersError: AxiosError;
providersFetchStatus: FetchStatus;
Expand Down Expand Up @@ -83,6 +85,7 @@ class OcpOverviewWidgetBase extends React.Component<OcpOverviewWidgetProps> {
userAccessFetchStatus === FetchStatus.inProgress || providersFetchStatus === FetchStatus.inProgress;

const title = this.props.title;
const chartName = this.props.chartName;

// Test for no providers
const noProviders = !isOcpAvailable(providers, providersFetchStatus, userAccess);
Expand All @@ -101,7 +104,7 @@ class OcpOverviewWidgetBase extends React.Component<OcpOverviewWidgetProps> {
return (
<div style={styles.chartContent}>
<div style={styles.chartContainer}>
<OcpOverviewChart title={title} />
<OcpOverviewChart chartName={chartName} title={title} />
</div>
</div>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Dropdown, DropdownItem, KebabToggle } from '@patternfly/react-core';
import { AwsQuery } from 'api/queries/awsQuery';
import { ReportPathsType } from 'api/reports/report';
import { ExportModal } from 'pages/details/components/export/exportModal';
import { HistoricalModal } from 'pages/details/components/historicalChart/historicalModal';
import { SummaryModal } from 'pages/details/components/summary/summaryModal';
import { TagModal } from 'pages/details/components/tag/tagModal';
import { ExportModal } from 'routes/details/components/export/exportModal';
import { HistoricalModal } from 'routes/details/components/historicalChart/historicalModal';
import { SummaryModal } from 'routes/details/components/summary/summaryModal';
import { TagModal } from 'routes/details/components/tag/tagModal';
import React from 'react';
import { InjectedTranslateProps, translate } from 'react-i18next';
import { ComputedReportItem } from 'utils/computedReport/getComputedReportItems';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
Summary,
SummaryProps,
} from 'pages/details/components/summary/summary';
} from 'routes/details/components/summary/summary';
import React from 'react';
import { Omit } from 'react-redux';
import { ComputedAwsReportItemsParams } from 'utils/computedReport/getComputedAwsReportItems';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { AwsReport } from 'api/reports/awsReports';
import { ReportPathsType } from 'api/reports/report';
import { EmptyFilterState } from 'components/state/emptyFilterState/emptyFilterState';
import { EmptyValueState } from 'components/state/emptyValueState/emptyValueState';
import { Actions } from 'pages/details/components/actions/actions';
import { Actions } from 'routes/details/components/actions/actions';
import React from 'react';
import { InjectedTranslateProps, translate } from 'react-i18next';
import { connect } from 'react-redux';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import {
GridItem,
} from '@patternfly/react-core';
import { ReportPathsType } from 'api/reports/report';
import { HistoricalModal } from 'pages/details/components/historicalData/historicalModal';
import { Tag } from 'pages/details/components/tag/tag';
import { HistoricalModal } from 'routes/details/components/historicalData/historicalModal';
import { Tag } from 'routes/details/components/tag/tag';
import React from 'react';
import { InjectedTranslateProps, translate } from 'react-i18next';
import { connect } from 'react-redux';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
Summary,
SummaryProps,
} from 'pages/details/components/summary/summary';
} from 'routes/details/components/summary/summary';
import React from 'react';
import { Omit } from 'react-redux';
import { ComputedAzureReportItemsParams } from 'utils/computedReport/getComputedAzureReportItems';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { AzureReport } from 'api/reports/azureReports';
import { ReportPathsType } from 'api/reports/report';
import { EmptyFilterState } from 'components/state/emptyFilterState/emptyFilterState';
import { EmptyValueState } from 'components/state/emptyValueState/emptyValueState';
import { Actions } from 'pages/details/components/actions/actions';
import { Actions } from 'routes/details/components/actions/actions';
import React from 'react';
import { InjectedTranslateProps, translate } from 'react-i18next';
import { connect } from 'react-redux';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import {
GridItem,
} from '@patternfly/react-core';
import { ReportPathsType } from 'api/reports/report';
import { HistoricalModal } from 'pages/details/components/historicalData/historicalModal';
import { Tag } from 'pages/details/components/tag/tag';
import { HistoricalModal } from 'routes/details/components/historicalData/historicalModal';
import { Tag } from 'routes/details/components/tag/tag';
import React from 'react';
import { InjectedTranslateProps, translate } from 'react-i18next';
import { connect } from 'react-redux';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import { Dropdown, DropdownItem, KebabToggle } from '@patternfly/react-core';
import { Query } from 'api/queries/query';
import { tagKeyPrefix } from 'api/queries/query';
import { ReportPathsType } from 'api/reports/report';
import { ExportModal } from 'pages/details/components/export/exportModal';
import { HistoricalModal } from 'pages/details/components/historicalData/historicalModal';
import { PriceListModal } from 'pages/details/components/priceList/priceListModal';
import { SummaryModal } from 'pages/details/components/summary/summaryModal';
import { TagModal } from 'pages/details/components/tag/tagModal';
import { ExportModal } from 'routes/details/components/export/exportModal';
import { HistoricalModal } from 'routes/details/components/historicalData/historicalModal';
import { PriceListModal } from 'routes/details/components/priceList/priceListModal';
import { SummaryModal } from 'routes/details/components/summary/summaryModal';
import { TagModal } from 'routes/details/components/tag/tagModal';
import React from 'react';
import { InjectedTranslateProps, translate } from 'react-i18next';
import { ComputedReportItem } from 'utils/computedReport/getComputedReportItems';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { OcpCloudReport } from 'api/reports/ocpCloudReports';
import { ReportPathsType } from 'api/reports/report';
import { AxiosError } from 'axios';
import { EmptyValueState } from 'components/state/emptyValueState/emptyValueState';
import { GroupBy } from 'pages/details/components/groupBy/groupBy';
import { GroupBy } from 'routes/details/components/groupBy/groupBy';
import React from 'react';
import { InjectedTranslateProps, translate } from 'react-i18next';
import { connect } from 'react-redux';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
Summary,
SummaryProps,
} from 'pages/details/components/summary/summary';
} from 'routes/details/components/summary/summary';
import React from 'react';
import { Omit } from 'react-redux';
import { ComputedOcpCloudReportItemsParams } from 'utils/computedReport/getComputedOcpCloudReportItems';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { OcpCloudReport } from 'api/reports/ocpCloudReports';
import { ReportPathsType } from 'api/reports/report';
import { EmptyFilterState } from 'components/state/emptyFilterState/emptyFilterState';
import { EmptyValueState } from 'components/state/emptyValueState/emptyValueState';
import { Actions } from 'pages/details/components/actions/actions';
import { Actions } from 'routes/details/components/actions/actions';
import React from 'react';
import { InjectedTranslateProps, translate } from 'react-i18next';
import { connect } from 'react-redux';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import {
GridItem,
} from '@patternfly/react-core';
import { ReportPathsType } from 'api/reports/report';
import { BulletChart } from 'pages/details/components/bulletChart/bulletChart';
import { Cluster } from 'pages/details/components/cluster/cluster';
import { HistoricalModal } from 'pages/details/components/historicalData/historicalModal';
import { Tag } from 'pages/details/components/tag/tag';
import { BulletChart } from 'routes/details/components/bulletChart/bulletChart';
import { Cluster } from 'routes/details/components/cluster/cluster';
import { HistoricalModal } from 'routes/details/components/historicalData/historicalModal';
import { Tag } from 'routes/details/components/tag/tag';
import React from 'react';
import { InjectedTranslateProps, translate } from 'react-i18next';
import { connect } from 'react-redux';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ToolbarChipGroup } from '@patternfly/react-core';
import { getQuery, OcpCloudQuery } from 'api/queries/ocpCloudQuery';
import { OcpCloudReport } from 'api/reports/ocpCloudReports';
import { ReportPathsType, ReportType } from 'api/reports/report';
import { DataToolbar } from 'pages/details/components/dataToolbar/dataToolbar';
import { DataToolbar } from 'routes/details/components/dataToolbar/dataToolbar';
import React from 'react';
import { InjectedTranslateProps, translate } from 'react-i18next';
import { connect } from 'react-redux';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { HistoricalUsageChart } from 'components/charts/historicalUsageChart';
import {
chartStyles,
styles,
} from 'pages/details/components/historicalData/historicalChart.styles';
} from 'routes/details/components/historicalData/historicalChart.styles';
import React from 'react';
import { InjectedTranslateProps, translate } from 'react-i18next';
import { connect } from 'react-redux';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { AxiosError } from 'axios';
import { ErrorState } from 'components/state/errorState/errorState';
import { LoadingState } from 'components/state/loadingState/loadingState';
import { NoProvidersState } from 'components/state/noProvidersState/noProvidersState';
import { ExportModal } from 'pages/details/components/export/exportModal';
import { ExportModal } from 'routes/details/components/export/exportModal';
import React from 'react';
import { InjectedTranslateProps, translate } from 'react-i18next';
import { connect } from 'react-redux';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { OcpReport } from 'api/reports/ocpReports';
import { ReportPathsType } from 'api/reports/report';
import { EmptyFilterState } from 'components/state/emptyFilterState/emptyFilterState';
import { EmptyValueState } from 'components/state/emptyValueState/emptyValueState';
import { Actions } from 'pages/details/components/actions/actions';
import { Actions } from 'routes/details/components/actions/actions';
import React from 'react';
import { InjectedTranslateProps, translate } from 'react-i18next';
import { connect } from 'react-redux';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import {
GridItem,
} from '@patternfly/react-core';
import { ReportPathsType } from 'api/reports/report';
import { BulletChart } from 'pages/details/components/bulletChart/bulletChart';
import { Cluster } from 'pages/details/components/cluster/cluster';
import { HistoricalModal } from 'pages/details/components/historicalData/historicalModal';
import { Tag } from 'pages/details/components/tag/tag';
import { BulletChart } from 'routes/details/components/bulletChart/bulletChart';
import { Cluster } from 'routes/details/components/cluster/cluster';
import { HistoricalModal } from 'routes/details/components/historicalData/historicalModal';
import { Tag } from 'routes/details/components/tag/tag';
import React from 'react';
import { InjectedTranslateProps, translate } from 'react-i18next';
import { connect } from 'react-redux';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { HistoricalUsageChart } from 'components/charts/historicalUsageChart';
import {
chartStyles,
styles,
} from 'pages/details/components/historicalData/historicalChart.styles';
} from 'routes/details/components/historicalData/historicalChart.styles';
import React from 'react';
import { InjectedTranslateProps, translate } from 'react-i18next';
import { connect } from 'react-redux';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import {
ReportSummaryItem,
ReportSummaryItems,
} from 'components/reports/reportSummary';
import { styles } from 'pages/details/components/summary/summary.styles';
import { SummaryModal } from 'pages/details/components/summary/summaryModal';
import { styles } from 'routes/details/components/summary/summary.styles';
import { SummaryModal } from 'routes/details/components/summary/summaryModal';
import React from 'react';
import { InjectedTranslateProps, translate } from 'react-i18next';
import { connect } from 'react-redux';
Expand Down
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit c3d7bc1

Please sign in to comment.