particle-os/debian-image-builder-frontend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prepare for Provisioning list endpoint nesting

Browse source
This commit is contained in:
Ondrej Ezr 2023-08-08 16:48:57 +02:00 • committed by Lucas Garfield
parent fffdb27b70
commit 847ba2371d
5 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Components/CreateImageWizard/formComponents/AWSSourcesSelect.js
View file

@ -13,6 +13,7 @@ import {
} from '@patternfly/react-core';
import PropTypes from 'prop-types';
import { extractProvisioningList } from '../../../store/helpers';
import {
useGetSourceListQuery,
useGetSourceUploadInfoQuery,
@ -32,12 +33,13 @@ export const AWSSourcesSelect = ({
);
const {
data: sources,
data: rawSources,
isFetching,
isSuccess,
isError,
refetch,
} = useGetSourceListQuery({ provider: 'aws' });
const sources = extractProvisioningList(rawSources);
const {
data: sourceDetails,

4
src/Components/CreateImageWizard/formComponents/AzureSourcesSelect.js
View file

@ -13,6 +13,7 @@ import {
} from '@patternfly/react-core';
import PropTypes from 'prop-types';
import { extractProvisioningList } from '../../../store/helpers';
import {
useGetSourceListQuery,
useGetSourceUploadInfoQuery,
@ -25,12 +26,13 @@ const AzureSourcesSelect = ({ label, isRequired, className, ...props }) => {
const selectedSourceId = input.value;
const {
data: sources,
data: rawSources,
isFetching,
isSuccess,
isError,
refetch,
} = useGetSourceListQuery({ provider: 'azure' });
const sources = extractProvisioningList(rawSources);
const {
data: sourceDetails,

7
src/Components/CreateImageWizard/formComponents/ReviewStepTextLists.js
View file

@ -26,6 +26,7 @@ import {
} from './ReviewStepTables';
import { RELEASES, UNIT_GIB } from '../../../constants';
import { extractProvisioningList } from '../../../store/helpers';
import { useGetSourceListQuery } from '../../../store/provisioningApi';
import { useShowActivationKeyQuery } from '../../../store/rhsmApi';
import { useGetEnvironment } from '../../../Utilities/useGetEnvironment';
@ -64,9 +65,10 @@ export const ImageOutputList = () => {
};
export const TargetEnvAWSList = () => {
const { data: awsSources, isSuccess } = useGetSourceListQuery({
const { data: rawAWSSources, isSuccess } = useGetSourceListQuery({
provider: 'aws',
});
const awsSources = extractProvisioningList(rawAWSSources);
const { isBeta } = useGetEnvironment();
const { getState } = useFormApi();
@ -170,8 +172,9 @@ export const TargetEnvGCPList = () => {
export const TargetEnvAzureList = () => {
const { getState } = useFormApi();
const { data: azureSources, isSuccess: isSuccessAzureSources } =
const { data: rawAzureSources, isSuccess: isSuccessAzureSources } =
useGetSourceListQuery({ provider: 'azure' });
const azureSources = extractProvisioningList(rawAzureSources);
return (
<TextContent>
<Text component={TextVariants.h3}>Microsoft Azure</Text>

7
src/Components/ImagesTable/ImageDetails.js
View file

@ -17,6 +17,7 @@ import { useSelector } from 'react-redux';
import ClonesTable from './ClonesTable';
import { extractProvisioningList } from '../../store/helpers';
import { useGetSourceListQuery } from '../../store/provisioningApi';
const sourceNotFoundPopover = () => {
@ -59,9 +60,10 @@ const sourceNotFoundPopover = () => {
};
const getAzureSourceName = (id) => {
const { data: sources, isSuccess } = useGetSourceListQuery({
const { data: rawSources, isSuccess } = useGetSourceListQuery({
provider: 'azure',
});
const sources = extractProvisioningList(rawSources);
if (isSuccess) {
const sourcename = sources.find((source) => source.id === id);
@ -76,9 +78,10 @@ const getAzureSourceName = (id) => {
};
const getAWSSourceName = (id) => {
const { data: sources, isSuccess } = useGetSourceListQuery({
const { data: rawSources, isSuccess } = useGetSourceListQuery({
provider: 'aws',
});
const sources = extractProvisioningList(rawSources);
if (isSuccess) {
const sourcename = sources.find((source) => source.id === id);