diff --git a/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/AddAssetStep.js b/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/AddAssetStep.js index 5f331bf436..f4098ae100 100644 --- a/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/AddAssetStep.js +++ b/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/AddAssetStep.js @@ -10,7 +10,7 @@ import { FromUrlForm } from './FromUrlForm'; import { FromComputerForm } from './FromComputerForm'; import { getTrad } from '../../../utils'; -export const AddAssetStep = ({ onClose }) => { +export const AddAssetStep = ({ onClose, onAddAsset }) => { const { formatMessage } = useIntl(); return ( @@ -54,7 +54,7 @@ export const AddAssetStep = ({ onClose }) => { - + @@ -64,4 +64,5 @@ export const AddAssetStep = ({ onClose }) => { AddAssetStep.propTypes = { onClose: PropTypes.func.isRequired, + onAddAsset: PropTypes.func.isRequired, }; diff --git a/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/FromUrlForm.js b/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/FromUrlForm.js index af081b15de..a738d7fc14 100644 --- a/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/FromUrlForm.js +++ b/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/FromUrlForm.js @@ -9,10 +9,12 @@ import { Form } from '@strapi/helper-plugin'; import { Formik } from 'formik'; import { getTrad, urlSchema } from '../../../utils'; -export const FromUrlForm = ({ onClose }) => { +export const FromUrlForm = ({ onClose, onAddAsset }) => { const { formatMessage } = useIntl(); - const handleSubmit = () => {}; + const handleSubmit = () => { + onAddAsset(); + }; return ( { FromUrlForm.propTypes = { onClose: PropTypes.func.isRequired, + onAddAsset: PropTypes.func.isRequired, }; diff --git a/packages/core/upload/admin/src/components/UploadAssetDialog/UploadAssetDialog.js b/packages/core/upload/admin/src/components/UploadAssetDialog/UploadAssetDialog.js index 871cff2442..4d15ca77e1 100644 --- a/packages/core/upload/admin/src/components/UploadAssetDialog/UploadAssetDialog.js +++ b/packages/core/upload/admin/src/components/UploadAssetDialog/UploadAssetDialog.js @@ -1,14 +1,28 @@ -import React from 'react'; +import React, { useState } from 'react'; import PropTypes from 'prop-types'; import { ModalLayout } from '@strapi/parts/ModalLayout'; import { AddAssetStep } from './AddAssetStep/AddAssetStep'; import { PendingAssetStep } from './PendingAssetStep/PendingAssetStep'; +const Steps = { + AddAsset: 'AddAsset', + PendingAsset: 'PendingAsset', +}; + export const UploadAssetDialog = ({ onSuccess, onClose }) => { + const [step, setStep] = useState(Steps.AddAsset); + + const handleAddToPendingAssets = () => { + setStep(Steps.PendingAsset); + onSuccess(); + }; + return ( - {/* */} - + {step === Steps.AddAsset && ( + + )} + {step === Steps.PendingAsset && } ); }; diff --git a/packages/core/upload/admin/src/components/UploadAssetDialog/tests/UploadAssetDialog.test.js b/packages/core/upload/admin/src/components/UploadAssetDialog/tests/UploadAssetDialog.test.js index bf46ab8188..c2df5eda61 100644 --- a/packages/core/upload/admin/src/components/UploadAssetDialog/tests/UploadAssetDialog.test.js +++ b/packages/core/upload/admin/src/components/UploadAssetDialog/tests/UploadAssetDialog.test.js @@ -52,13 +52,6 @@ describe('', () => { padding-left: 20px; } - .c11 { - padding-top: 24px; - padding-right: 40px; - padding-bottom: 24px; - padding-left: 40px; - } - .c1 { position: absolute; z-index: 3; @@ -92,20 +85,6 @@ describe('', () => { align-items: center; } - .c23 { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - -webkit-flex-direction: row; - -ms-flex-direction: row; - flex-direction: row; - -webkit-align-items: center; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - } - .c9 { display: -webkit-box; display: -webkit-flex; @@ -159,14 +138,6 @@ describe('', () => { border-bottom: 1px solid #eaeaef; } - .c22 { - border-top: 1px solid #eaeaef; - } - - .c24 > * + * { - margin-left: 8px; - } - .c7 { font-weight: 400; font-size: 0.875rem; @@ -179,146 +150,6 @@ describe('', () => { line-height: 1.14; } - .c28 { - font-weight: 500; - font-size: 0.75rem; - line-height: 1.33; - color: #32324d; - } - - .c25 { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - cursor: pointer; - padding: 8px; - border-radius: 4px; - background: #ffffff; - border: 1px solid #dcdce4; - } - - .c25 svg { - height: 12px; - width: 12px; - } - - .c25 svg > g, - .c25 svg path { - fill: #ffffff; - } - - .c25[aria-disabled='true'] { - pointer-events: none; - } - - .c26 { - padding: 8px 16px; - background: #4945ff; - border: none; - border: 1px solid #dcdce4; - background: #ffffff; - } - - .c26 .c27 { - color: #ffffff; - } - - .c26[aria-disabled='true'] { - border: 1px solid #dcdce4; - background: #eaeaef; - } - - .c26[aria-disabled='true'] .c27 { - color: #666687; - } - - .c26[aria-disabled='true'] svg > g, - .c26[aria-disabled='true'] svg path { - fill: #666687; - } - - .c26[aria-disabled='true']:active { - border: 1px solid #dcdce4; - background: #eaeaef; - } - - .c26[aria-disabled='true']:active .c27 { - color: #666687; - } - - .c26[aria-disabled='true']:active svg > g, - .c26[aria-disabled='true']:active svg path { - fill: #666687; - } - - .c26:hover { - background-color: #f6f6f9; - } - - .c26:active { - background-color: #eaeaef; - } - - .c26 .c27 { - color: #32324d; - } - - .c26 svg > g, - .c26 svg path { - fill: #32324d; - } - - .c29 { - padding: 8px 16px; - background: #4945ff; - border: none; - border: 1px solid #4945ff; - background: #4945ff; - } - - .c29 .c27 { - color: #ffffff; - } - - .c29[aria-disabled='true'] { - border: 1px solid #dcdce4; - background: #eaeaef; - } - - .c29[aria-disabled='true'] .c27 { - color: #666687; - } - - .c29[aria-disabled='true'] svg > g, - .c29[aria-disabled='true'] svg path { - fill: #666687; - } - - .c29[aria-disabled='true']:active { - border: 1px solid #dcdce4; - background: #eaeaef; - } - - .c29[aria-disabled='true']:active .c27 { - color: #666687; - } - - .c29[aria-disabled='true']:active svg > g, - .c29[aria-disabled='true']:active svg path { - fill: #666687; - } - - .c29:hover { - border: 1px solid #7b79ff; - background: #7b79ff; - } - - .c29:active { - border: 1px solid #4945ff; - background: #4945ff; - } - .c19 { background: #eaeaef; } @@ -329,6 +160,17 @@ describe('', () => { margin: 0; } + .c11 { + padding-top: 24px; + padding-right: 40px; + padding-left: 40px; + } + + .c21 { + padding-top: 16px; + padding-bottom: 16px; + } + .c14 { font-weight: 400; font-size: 0.875rem; @@ -367,11 +209,6 @@ describe('', () => { border-bottom: 2px solid transparent; } - .c21 { - padding-top: 16px; - padding-bottom: 16px; - } - @@ -443,10 +280,10 @@ describe('', () => { -
-
+
+
{
-
-
-
- From URL form -
-
-
-
-
-
+
- -
-
- + From computer form +