feat: [AXIMST-517] request within the demo

raccoongang · Feb 26, 2024 · a3fb0ab · a3fb0ab
1 parent 68d7533
commit a3fb0ab
Show file tree

Hide file tree

Showing 19 changed files with 94 additions and 28 deletions.
diff --git a/src/certificates/certificate-signatories/messages.js b/src/certificates/certificate-signatories/messages.js
@@ -71,12 +71,16 @@ const messages = defineMessages({
   },
   uploadImageButton: {
     id: 'course-authoring.certificates.signatories.upload.image.button',
-    defaultMessage: 'Upload signature image',
+    defaultMessage: '{uploadText} signature image',
   },
   uploadModal: {
     id: 'course-authoring.certificates.signatories.upload.modal',
     defaultMessage: 'Upload',
   },
+  uploadModalReplace: {
+    id: 'course-authoring.certificates.signatories.upload.modal.replace',
+    defaultMessage: 'Replace',
+  },
   deleteSignatoryConfirmation: {
     id: 'course-authoring.certificates.signatories.confirm-modal',
     defaultMessage: 'Delete "{name}" from the list of signatories?',

diff --git a/src/certificates/certificate-signatories/signatory/SignatoryForm.jsx b/src/certificates/certificate-signatories/signatory/SignatoryForm.jsx
@@ -120,7 +120,16 @@ const SignatoryForm = ({
                 <span className="x-small">{intl.formatMessage(messages.imageDescription)}</span>
               </Form.Control.Feedback>
             </Stack>
-            <Button onClick={open}>{intl.formatMessage(messages.uploadImageButton)}</Button>
+            <Button onClick={open}>
+              {intl.formatMessage(
+                messages.uploadImageButton,
+                {
+                  uploadText: signatureImagePath
+                    ? intl.formatMessage(messages.uploadModalReplace)
+                    : intl.formatMessage(messages.uploadModal),
+                },
+              )}
+            </Button>
           </Stack>
         </Form.Group>
       </Stack>

diff --git a/src/certificates/certificate-signatories/signatory/SignatoryForm.test.jsx b/src/certificates/certificate-signatories/signatory/SignatoryForm.test.jsx
@@ -12,14 +12,6 @@ import SignatoryForm from './SignatoryForm';
 
 let store;
 
-jest.mock('@edx/frontend-platform/i18n', () => ({
-  ...jest.requireActual('@edx/frontend-platform/i18n'),
-  useIntl: () => ({
-    formatMessage: (message) => message.defaultMessage,
-  }),
-  getConfig: () => ({ STUDIO_BASE_URL: 'http://localhost' }),
-}));
-
 const renderSignatory = (props) => render(
   <Provider store={store}>
     <IntlProvider locale="en">
@@ -83,11 +75,14 @@ describe('Signatory Component', () => {
 
   it('opens image upload modal on button click', () => {
     const { getByRole, queryByRole } = renderSignatory(defaultProps);
-    const uploadButton = getByRole('button', { name: messages.uploadImageButton.defaultMessage });
+    const replaceButton = getByRole(
+      'button',
+      { name: messages.uploadImageButton.defaultMessage.replace('{uploadText}', messages.uploadModalReplace.defaultMessage) },
+    );
 
     expect(queryByRole('presentation')).not.toBeInTheDocument();
 
-    userEvent.click(uploadButton);
+    userEvent.click(replaceButton);
 
     expect(getByRole('presentation')).toBeInTheDocument();
   });
@@ -120,4 +115,47 @@ describe('Signatory Component', () => {
 
     expect(deleteIcon).not.toBeInTheDocument();
   });
+
+  it('renders button with Replace text if there is a signatureImagePath', () => {
+    const newProps = {
+      ...defaultProps,
+      isEdit: false,
+    };
+
+    const { getByRole, queryByRole } = renderSignatory(newProps);
+
+    const replaceButton = getByRole(
+      'button',
+      { name: messages.uploadImageButton.defaultMessage.replace('{uploadText}', messages.uploadModalReplace.defaultMessage) },
+    );
+    const uploadButton = queryByRole(
+      'button',
+      { name: messages.uploadImageButton.defaultMessage.replace('{uploadText}', messages.uploadModal.defaultMessage) },
+    );
+
+    expect(replaceButton).toBeInTheDocument();
+    expect(uploadButton).not.toBeInTheDocument();
+  });
+
+  it('renders button with Upload text if there is no signatureImagePath', () => {
+    const newProps = {
+      ...defaultProps,
+      signatureImagePath: '',
+      isEdit: false,
+    };
+
+    const { getByRole, queryByRole } = renderSignatory(newProps);
+
+    const uploadButton = getByRole(
+      'button',
+      { name: messages.uploadImageButton.defaultMessage.replace('{uploadText}', messages.uploadModal.defaultMessage) },
+    );
+    const replaceButton = queryByRole(
+      'button',
+      { name: messages.uploadImageButton.defaultMessage.replace('{uploadText}', messages.uploadModalReplace.defaultMessage) },
+    );
+
+    expect(uploadButton).toBeInTheDocument();
+    expect(replaceButton).not.toBeInTheDocument();
+  });
 });
diff --git a/src/generic/modal-dropzone/useModalDropzone.jsx b/src/generic/modal-dropzone/useModalDropzone.jsx
@@ -101,7 +101,7 @@ const useModalDropzone = ({
 
         setTimeout(() => {
           onClose();
-        }, 1000);
+        }, 0);
       }
     } catch (error) {
       onSavingStatus({ status: RequestStatus.FAILED });

diff --git a/src/i18n/messages/ar.json b/src/i18n/messages/ar.json
@@ -1041,8 +1041,9 @@
   "course-authoring.certificates.signatories.image.label": "Signature image",
   "course-authoring.certificates.signatories.image.placeholder": "Path to signature image",
   "course-authoring.certificates.signatories.image.description": "Image must be in PNG format",
-  "course-authoring.certificates.signatories.upload.image.button": "Upload signature image",
+  "course-authoring.certificates.signatories.upload.image.button": "{uploadText} signature image",
   "course-authoring.certificates.signatories.upload.modal": "Upload",
+  "course-authoring.certificates.signatories.upload.modal.replace": "Replace",
   "course-authoring.certificates.signatories.confirm-modal": "Delete \"{name}\" from the list of signatories?",
   "course-authoring.certificates.signatories.confirm-modal.message": "This action cannot be undone.",
   "course-authoring.certificates.modal-dropzone.text": "Drag and drop your image here or click to upload",

diff --git a/src/i18n/messages/de.json b/src/i18n/messages/de.json
@@ -1041,8 +1041,9 @@
   "course-authoring.certificates.signatories.image.label": "Signature image",
   "course-authoring.certificates.signatories.image.placeholder": "Path to signature image",
   "course-authoring.certificates.signatories.image.description": "Image must be in PNG format",
-  "course-authoring.certificates.signatories.upload.image.button": "Upload signature image",
+  "course-authoring.certificates.signatories.upload.image.button": "{uploadText} signature image",
   "course-authoring.certificates.signatories.upload.modal": "Upload",
+  "course-authoring.certificates.signatories.upload.modal.replace": "Replace",
   "course-authoring.certificates.signatories.confirm-modal": "Delete \"{name}\" from the list of signatories?",
   "course-authoring.certificates.signatories.confirm-modal.message": "This action cannot be undone.",
   "course-authoring.certificates.modal-dropzone.text": "Drag and drop your image here or click to upload",

diff --git a/src/i18n/messages/de_DE.json b/src/i18n/messages/de_DE.json
@@ -1041,8 +1041,9 @@
   "course-authoring.certificates.signatories.image.label": "Signature image",
   "course-authoring.certificates.signatories.image.placeholder": "Path to signature image",
   "course-authoring.certificates.signatories.image.description": "Image must be in PNG format",
-  "course-authoring.certificates.signatories.upload.image.button": "Upload signature image",
+  "course-authoring.certificates.signatories.upload.image.button": "{uploadText} signature image",
   "course-authoring.certificates.signatories.upload.modal": "Upload",
+  "course-authoring.certificates.signatories.upload.modal.replace": "Replace",
   "course-authoring.certificates.signatories.confirm-modal": "Delete \"{name}\" from the list of signatories?",
   "course-authoring.certificates.signatories.confirm-modal.message": "This action cannot be undone.",
   "course-authoring.certificates.modal-dropzone.text": "Drag and drop your image here or click to upload",

diff --git a/src/i18n/messages/es_419.json b/src/i18n/messages/es_419.json
@@ -1041,8 +1041,9 @@
   "course-authoring.certificates.signatories.image.label": "Signature image",
   "course-authoring.certificates.signatories.image.placeholder": "Path to signature image",
   "course-authoring.certificates.signatories.image.description": "Image must be in PNG format",
-  "course-authoring.certificates.signatories.upload.image.button": "Upload signature image",
+  "course-authoring.certificates.signatories.upload.image.button": "{uploadText} signature image",
   "course-authoring.certificates.signatories.upload.modal": "Upload",
+  "course-authoring.certificates.signatories.upload.modal.replace": "Replace",
   "course-authoring.certificates.signatories.confirm-modal": "Delete \"{name}\" from the list of signatories?",
   "course-authoring.certificates.signatories.confirm-modal.message": "This action cannot be undone.",
   "course-authoring.certificates.modal-dropzone.text": "Drag and drop your image here or click to upload",

diff --git a/src/i18n/messages/fa_IR.json b/src/i18n/messages/fa_IR.json
@@ -64,8 +64,9 @@
   "course-authoring.certificates.signatories.image.label": "Signature image",
   "course-authoring.certificates.signatories.image.placeholder": "Path to signature image",
   "course-authoring.certificates.signatories.image.description": "Image must be in PNG format",
-  "course-authoring.certificates.signatories.upload.image.button": "Upload signature image",
+  "course-authoring.certificates.signatories.upload.image.button": "{uploadText} signature image",
   "course-authoring.certificates.signatories.upload.modal": "Upload",
+  "course-authoring.certificates.signatories.upload.modal.replace": "Replace",
   "course-authoring.certificates.signatories.confirm-modal": "Delete \"{name}\" from the list of signatories?",
   "course-authoring.certificates.signatories.confirm-modal.message": "This action cannot be undone.",
   "course-authoring.certificates.modal-dropzone.text": "Drag and drop your image here or click to upload",

diff --git a/src/i18n/messages/fr.json b/src/i18n/messages/fr.json
@@ -1041,8 +1041,9 @@
   "course-authoring.certificates.signatories.image.label": "Signature image",
   "course-authoring.certificates.signatories.image.placeholder": "Path to signature image",
   "course-authoring.certificates.signatories.image.description": "Image must be in PNG format",
-  "course-authoring.certificates.signatories.upload.image.button": "Upload signature image",
+  "course-authoring.certificates.signatories.upload.image.button": "{uploadText} signature image",
   "course-authoring.certificates.signatories.upload.modal": "Upload",
+  "course-authoring.certificates.signatories.upload.modal.replace": "Replace",
   "course-authoring.certificates.signatories.confirm-modal": "Delete \"{name}\" from the list of signatories?",
   "course-authoring.certificates.signatories.confirm-modal.message": "This action cannot be undone.",
   "course-authoring.certificates.modal-dropzone.text": "Drag and drop your image here or click to upload",

diff --git a/src/i18n/messages/fr_CA.json b/src/i18n/messages/fr_CA.json
@@ -1041,8 +1041,9 @@
   "course-authoring.certificates.signatories.image.label": "Signature image",
   "course-authoring.certificates.signatories.image.placeholder": "Path to signature image",
   "course-authoring.certificates.signatories.image.description": "Image must be in PNG format",
-  "course-authoring.certificates.signatories.upload.image.button": "Upload signature image",
+  "course-authoring.certificates.signatories.upload.image.button": "{uploadText} signature image",
   "course-authoring.certificates.signatories.upload.modal": "Upload",
+  "course-authoring.certificates.signatories.upload.modal.replace": "Replace",
   "course-authoring.certificates.signatories.confirm-modal": "Delete \"{name}\" from the list of signatories?",
   "course-authoring.certificates.signatories.confirm-modal.message": "This action cannot be undone.",
   "course-authoring.certificates.modal-dropzone.text": "Drag and drop your image here or click to upload",

diff --git a/src/i18n/messages/hi.json b/src/i18n/messages/hi.json
@@ -1041,8 +1041,9 @@
   "course-authoring.certificates.signatories.image.label": "Signature image",
   "course-authoring.certificates.signatories.image.placeholder": "Path to signature image",
   "course-authoring.certificates.signatories.image.description": "Image must be in PNG format",
-  "course-authoring.certificates.signatories.upload.image.button": "Upload signature image",
+  "course-authoring.certificates.signatories.upload.image.button": "{uploadText} signature image",
   "course-authoring.certificates.signatories.upload.modal": "Upload",
+  "course-authoring.certificates.signatories.upload.modal.replace": "Replace",
   "course-authoring.certificates.signatories.confirm-modal": "Delete \"{name}\" from the list of signatories?",
   "course-authoring.certificates.signatories.confirm-modal.message": "This action cannot be undone.",
   "course-authoring.certificates.modal-dropzone.text": "Drag and drop your image here or click to upload",

diff --git a/src/i18n/messages/it.json b/src/i18n/messages/it.json
@@ -1041,8 +1041,9 @@
   "course-authoring.certificates.signatories.image.label": "Signature image",
   "course-authoring.certificates.signatories.image.placeholder": "Path to signature image",
   "course-authoring.certificates.signatories.image.description": "Image must be in PNG format",
-  "course-authoring.certificates.signatories.upload.image.button": "Upload signature image",
+  "course-authoring.certificates.signatories.upload.image.button": "{uploadText} signature image",
   "course-authoring.certificates.signatories.upload.modal": "Upload",
+  "course-authoring.certificates.signatories.upload.modal.replace": "Replace",
   "course-authoring.certificates.signatories.confirm-modal": "Delete \"{name}\" from the list of signatories?",
   "course-authoring.certificates.signatories.confirm-modal.message": "This action cannot be undone.",
   "course-authoring.certificates.modal-dropzone.text": "Drag and drop your image here or click to upload",

diff --git a/src/i18n/messages/it_IT.json b/src/i18n/messages/it_IT.json
@@ -1041,8 +1041,9 @@
   "course-authoring.certificates.signatories.image.label": "Signature image",
   "course-authoring.certificates.signatories.image.placeholder": "Path to signature image",
   "course-authoring.certificates.signatories.image.description": "Image must be in PNG format",
-  "course-authoring.certificates.signatories.upload.image.button": "Upload signature image",
+  "course-authoring.certificates.signatories.upload.image.button": "{uploadText} signature image",
   "course-authoring.certificates.signatories.upload.modal": "Upload",
+  "course-authoring.certificates.signatories.upload.modal.replace": "Replace",
   "course-authoring.certificates.signatories.confirm-modal": "Delete \"{name}\" from the list of signatories?",
   "course-authoring.certificates.signatories.confirm-modal.message": "This action cannot be undone.",
   "course-authoring.certificates.modal-dropzone.text": "Drag and drop your image here or click to upload",

diff --git a/src/i18n/messages/pt.json b/src/i18n/messages/pt.json
@@ -1041,8 +1041,9 @@
   "course-authoring.certificates.signatories.image.label": "Signature image",
   "course-authoring.certificates.signatories.image.placeholder": "Path to signature image",
   "course-authoring.certificates.signatories.image.description": "Image must be in PNG format",
-  "course-authoring.certificates.signatories.upload.image.button": "Upload signature image",
+  "course-authoring.certificates.signatories.upload.image.button": "{uploadText} signature image",
   "course-authoring.certificates.signatories.upload.modal": "Upload",
+  "course-authoring.certificates.signatories.upload.modal.replace": "Replace",
   "course-authoring.certificates.signatories.confirm-modal": "Delete \"{name}\" from the list of signatories?",
   "course-authoring.certificates.signatories.confirm-modal.message": "This action cannot be undone.",
   "course-authoring.certificates.modal-dropzone.text": "Drag and drop your image here or click to upload",

diff --git a/src/i18n/messages/pt_PT.json b/src/i18n/messages/pt_PT.json
@@ -1041,8 +1041,9 @@
   "course-authoring.certificates.signatories.image.label": "Signature image",
   "course-authoring.certificates.signatories.image.placeholder": "Path to signature image",
   "course-authoring.certificates.signatories.image.description": "Image must be in PNG format",
-  "course-authoring.certificates.signatories.upload.image.button": "Upload signature image",
+  "course-authoring.certificates.signatories.upload.image.button": "{uploadText} signature image",
   "course-authoring.certificates.signatories.upload.modal": "Upload",
+  "course-authoring.certificates.signatories.upload.modal.replace": "Replace",
   "course-authoring.certificates.signatories.confirm-modal": "Delete \"{name}\" from the list of signatories?",
   "course-authoring.certificates.signatories.confirm-modal.message": "This action cannot be undone.",
   "course-authoring.certificates.modal-dropzone.text": "Drag and drop your image here or click to upload",

diff --git a/src/i18n/messages/ru.json b/src/i18n/messages/ru.json
@@ -1041,8 +1041,9 @@
   "course-authoring.certificates.signatories.image.label": "Signature image",
   "course-authoring.certificates.signatories.image.placeholder": "Path to signature image",
   "course-authoring.certificates.signatories.image.description": "Image must be in PNG format",
-  "course-authoring.certificates.signatories.upload.image.button": "Upload signature image",
+  "course-authoring.certificates.signatories.upload.image.button": "{uploadText} signature image",
   "course-authoring.certificates.signatories.upload.modal": "Upload",
+  "course-authoring.certificates.signatories.upload.modal.replace": "Replace",
   "course-authoring.certificates.signatories.confirm-modal": "Delete \"{name}\" from the list of signatories?",
   "course-authoring.certificates.signatories.confirm-modal.message": "This action cannot be undone.",
   "course-authoring.certificates.modal-dropzone.text": "Drag and drop your image here or click to upload",

diff --git a/src/i18n/messages/uk.json b/src/i18n/messages/uk.json
@@ -1041,8 +1041,9 @@
   "course-authoring.certificates.signatories.image.label": "Signature image",
   "course-authoring.certificates.signatories.image.placeholder": "Path to signature image",
   "course-authoring.certificates.signatories.image.description": "Image must be in PNG format",
-  "course-authoring.certificates.signatories.upload.image.button": "Upload signature image",
+  "course-authoring.certificates.signatories.upload.image.button": "{uploadText} signature image",
   "course-authoring.certificates.signatories.upload.modal": "Upload",
+  "course-authoring.certificates.signatories.upload.modal.replace": "Replace",
   "course-authoring.certificates.signatories.confirm-modal": "Delete \"{name}\" from the list of signatories?",
   "course-authoring.certificates.signatories.confirm-modal.message": "This action cannot be undone.",
   "course-authoring.certificates.modal-dropzone.text": "Drag and drop your image here or click to upload",

diff --git a/src/i18n/messages/zh_CN.json b/src/i18n/messages/zh_CN.json
@@ -1041,8 +1041,9 @@
   "course-authoring.certificates.signatories.image.label": "Signature image",
   "course-authoring.certificates.signatories.image.placeholder": "Path to signature image",
   "course-authoring.certificates.signatories.image.description": "Image must be in PNG format",
-  "course-authoring.certificates.signatories.upload.image.button": "Upload signature image",
+  "course-authoring.certificates.signatories.upload.image.button": "{uploadText} signature image",
   "course-authoring.certificates.signatories.upload.modal": "Upload",
+  "course-authoring.certificates.signatories.upload.modal.replace": "Replace",
   "course-authoring.certificates.signatories.confirm-modal": "Delete \"{name}\" from the list of signatories?",
   "course-authoring.certificates.signatories.confirm-modal.message": "This action cannot be undone.",
   "course-authoring.certificates.modal-dropzone.text": "Drag and drop your image here or click to upload",