small fix for consistency

atlassian · Feb 6, 2025 · 4e7a81f · 4e7a81f
1 parent d5db8ae
commit 4e7a81f
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 36 deletions.
diff --git a/src/webviews/components/issue/CreateIssuePage.tsx b/src/webviews/components/issue/CreateIssuePage.tsx
@@ -65,6 +65,7 @@ const IconValue = (props: any) => (
 export default class CreateIssuePage extends AbstractIssueEditorPage<Emit, Accept, {}, ViewState> {
     private advancedFields: FieldUI[] = [];
     private commonFields: FieldUI[] = [];
+    private attachingInProgress: boolean;
 
     getProjectKey(): string {
         return this.state.fieldValues['project'].key;
@@ -191,22 +192,29 @@ export default class CreateIssuePage extends AbstractIssueEditorPage<Emit, Accep
     };
 
     protected handleInlineAttachments = async (fieldkey: string, newValue: any) => {
+        if (this.attachingInProgress) {
+            return;
+        }
+
         if (Array.isArray(newValue) && newValue.length > 0) {
-            readFilesContentAsync(newValue).then((filesWithContent) => {
-                const serFiles = filesWithContent.map((file) => {
-                    return {
-                        lastModified: file.lastModified,
-                        lastModifiedDate: (file as any).lastModifiedDate,
-                        name: file.name,
-                        size: file.size,
-                        type: file.type,
-                        path: (file as any).path,
-                        fileContent: file.fileContent,
-                    };
-                });
-
-                this.setState({ fieldValues: { ...this.state.fieldValues, ...{ [fieldkey]: serFiles } } });
-            });
+            this.attachingInProgress = true;
+            readFilesContentAsync(newValue)
+                .then((filesWithContent) => {
+                    const serFiles = filesWithContent.map((file) => {
+                        return {
+                            lastModified: file.lastModified,
+                            lastModifiedDate: (file as any).lastModifiedDate,
+                            name: file.name,
+                            size: file.size,
+                            type: file.type,
+                            path: (file as any).path,
+                            fileContent: file.fileContent,
+                        };
+                    });
+
+                    this.setState({ fieldValues: { ...this.state.fieldValues, ...{ [fieldkey]: serFiles } } });
+                })
+                .finally(() => this.attachingInProgress = false);
         }
     };
 

diff --git a/src/webviews/components/issue/JiraIssuePage.tsx b/src/webviews/components/issue/JiraIssuePage.tsx
@@ -392,27 +392,28 @@ export default class JiraIssuePage extends AbstractIssueEditorPage<Emit, Accept,
         }
         this.attachingInProgress = true;
 
-        readFilesContentAsync(files).then((filesWithContent) => {
-            this.setState({ currentInlineDialog: '', isSomethingLoading: false, loadingField: 'attachment' });
-            const serFiles = filesWithContent.map((file) => {
-                return {
-                    lastModified: file.lastModified,
-                    lastModifiedDate: (file as any).lastModifiedDate,
-                    name: file.name,
-                    size: file.size,
-                    type: file.type,
-                    path: (file as any).path,
-                    fileContent: file.fileContent,
-                };
-            });
-            this.postMessage({
-                action: 'addAttachments',
-                site: this.state.siteDetails,
-                issueKey: this.state.key,
-                files: serFiles,
-            });
-            this.attachingInProgress = false;
-        });
+        readFilesContentAsync(files)
+            .then((filesWithContent) => {
+                this.setState({ currentInlineDialog: '', isSomethingLoading: false, loadingField: 'attachment' });
+                const serFiles = filesWithContent.map((file) => {
+                    return {
+                        lastModified: file.lastModified,
+                        lastModifiedDate: (file as any).lastModifiedDate,
+                        name: file.name,
+                        size: file.size,
+                        type: file.type,
+                        path: (file as any).path,
+                        fileContent: file.fileContent,
+                    };
+                });
+                this.postMessage({
+                    action: 'addAttachments',
+                    site: this.state.siteDetails,
+                    issueKey: this.state.key,
+                    files: serFiles,
+                });
+            })
+            .finally(() => this.attachingInProgress = false);
     };
 
     handleDeleteAttachment = (file: any) => {