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

CreateImageWizard: use non-deprecated image type aliases

Browse source 
'ami' was deprecated a while ago, and is kept around as an alias of
'aws'. Same with 'vhd' and 'azure', and 'vhd' and 'gcp'.

This maintains support for the old aliases where necessary.
This commit is contained in:
Sanne Raymaekers 2022-12-05 14:25:40 +01:00
parent dd08069e48
commit cb8ab9347e
8 changed files with 24 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -77,7 +77,7 @@ const onSave = (values) => {
image_requests: [
{
architecture: 'x86_64',
image_type: 'ami',
image_type: 'aws',
upload_request: {
type: 'aws',
options: {
@ -136,7 +136,7 @@ const onSave = (values) => {
image_requests: [
{
architecture: 'x86_64',
image_type: 'vhd',
image_type: 'azure',
upload_request: {
type: 'azure',
options: {

5
src/Components/ImagesTable/ImageBuildStatus.js
View file

@ -95,7 +95,10 @@ export const ImageBuildStatus = ({ imageId }) => {
};
let status;
if (image.imageType === 'aws') {
if (
!image.isClone &&
(image.imageType === 'aws' || image.imageType === 'ami')
) {
const imageStatuses = useSelector((state) =>
selectImageStatusesById(state, image.id)
);

5
src/Components/ImagesTable/ImageLink.js
View file

@ -68,7 +68,10 @@ const ImageLink = ({ imageId, isExpired, isInClonesTable }) => {
if (!uploadStatus) return null;
if (hasProvisioning && image.imageType === 'ami') {
if (
hasProvisioning &&
(image.imageType === 'aws' || image.imageType === 'ami')
) {
return (
<ProvisioningLink
imageId={image.id}

2
src/store/clonesSlice.js
View file

@ -41,7 +41,7 @@ export const selectCloneById = (state, cloneId) => {
status: clone.image_status?.status,
uploadStatus: clone.image_status?.upload_status,
parent: clone.parent,
imageType: 'ami',
imageType: 'aws',
isClone: true,
};
} else {

4
src/test/Components/CreateImageWizard/CreateImageWizard.test.js
View file

@ -1617,7 +1617,7 @@ describe('Click through all steps', () => {
image_requests: [
{
architecture: 'x86_64',
image_type: 'ami',
image_type: 'aws',
upload_request: {
type: 'aws',
options: {
@ -1701,7 +1701,7 @@ describe('Click through all steps', () => {
image_requests: [
{
architecture: 'x86_64',
image_type: 'vhd',
image_type: 'azure',
upload_request: {
type: 'azure',
options: {

18
src/test/Components/ImagesTable/ImagesTable.test.js
View file

@ -31,7 +31,7 @@ const mockComposes = {
image_requests: [
{
architecture: 'x86_64',
image_type: 'ami',
image_type: 'aws',
upload_request: {
type: 'aws',
options: {
@ -51,7 +51,7 @@ const mockComposes = {
image_requests: [
{
architecture: 'x86_64',
image_type: 'vhd',
image_type: 'gcp',
upload_request: {
type: 'gcp',
options: {
@ -70,7 +70,7 @@ const mockComposes = {
image_requests: [
{
architecture: 'x86_64',
image_type: 'ami',
image_type: 'aws',
upload_request: {
type: 'aws',
options: {},
@ -87,7 +87,7 @@ const mockComposes = {
image_requests: [
{
architecture: 'x86_64',
image_type: 'ami',
image_type: 'aws',
upload_request: {
type: 'aws',
options: {},
@ -104,7 +104,7 @@ const mockComposes = {
image_requests: [
{
architecture: 'x86_64',
image_type: 'ami',
image_type: 'aws',
upload_request: {
type: 'aws',
options: {},
@ -121,7 +121,7 @@ const mockComposes = {
image_requests: [
{
architecture: 'x86_64',
image_type: 'ami',
image_type: 'aws',
upload_request: {
type: 'aws',
options: {},
@ -138,7 +138,7 @@ const mockComposes = {
image_requests: [
{
architecture: 'x86_64',
image_type: 'ami',
image_type: 'aws',
upload_request: {
type: 'aws',
options: {},
@ -155,7 +155,7 @@ const mockComposes = {
image_requests: [
{
architecture: 'x86_64',
image_type: 'vhd',
image_type: 'gcp',
upload_request: {
type: 'gcp',
options: {
@ -174,7 +174,7 @@ const mockComposes = {
image_requests: [
{
architecture: 'x86_64',
image_type: 'vhd',
image_type: 'azure',
upload_request: {
type: 'azure',
options: {},

2
src/test/Components/ShareImageModal/ShareImageModal.test.js
View file

@ -22,7 +22,7 @@ const mockComposes = {
image_requests: [
{
architecture: 'x86_64',
image_type: 'ami',
image_type: 'aws',
upload_request: {
type: 'aws',
options: {

2
src/test/redux/reducers.test.js
View file

@ -7,7 +7,7 @@ const compose = {
image_requests: [
{
architecture: 'x86_64',
image_type: 'ami',
image_type: 'aws',
upload_request: {
type: 'aws',
options: {},