Merge pull request #384 from AtkinsSJ/progress-dialogs

refactor: Replace several existing progress dialogs with one configurable one
HeyPuter · May 10, 2024 · 3992fe1 · 3992fe1
2 parents 17e08ca + edebbee
commit 3992fe1
Show file tree

Hide file tree

Showing 43 changed files with 293 additions and 653 deletions.
diff --git a/packages/backend/src/services/file-cache/FileCacheService.js b/packages/backend/src/services/file-cache/FileCacheService.js
@@ -250,7 +250,7 @@ class FileCacheService extends AdvancedBase {
         const path = this._get_path(tracker.key);
         console.log(`precache fetch key I guess?`, tracker.key);
         const data = this.precache.get(tracker.key);
-        console.log(`path and data: ${path} ${data}`);
+        // console.log(`path and data: ${path} ${data}`);
         await fs.promises.writeFile(path, data);
         this.precache.delete(tracker.key);
         tracker.phase = FileTracker.PHASE_DISK;

diff --git a/src/UI/Components/Button.js b/src/UI/Components/Button.js
@@ -33,14 +33,15 @@ export default class Button extends Component {
     create_template ({ template }) {
         if ( this.get('style') === 'link' ) {
             $(template).html(/*html*/`
-                <button type="submit" class="link-button code-confirm-btn" style="margin-top:10px;" disabled>${
+                <button type="submit" class="link-button" style="margin-top:10px;" disabled>${
                     html_encode(this.get('label'))
                 }</button>
             `);
             return;
         }
+        // TODO: Replace hack for 'small' with a better way to configure button classes.
         $(template).html(/*html*/`
-            <button type="submit" class="button button-block button-${this.get('style')} code-confirm-btn" style="margin-top:10px;" disabled>${
+            <button type="submit" class="button ${this.get('style') !== 'small' ? 'button-block' : ''} button-${this.get('style')}" style="margin-top:10px;" disabled>${
                 html_encode(this.get('label'))
             }</button>
         `);

diff --git a/src/UI/UIWindow.js b/src/UI/UIWindow.js
@@ -2086,6 +2086,7 @@ async function UIWindow(options) {
                             html: i18n('empty_trash'),
                             disabled: false,
                             onClick: async function(){
+                                // TODO: Merge this with window.empty_trash()
                                 const alert_resp = await UIAlert({
                                     message: i18n('empty_trash_confirmation'),
                                     buttons:[

diff --git a/src/UI/UIWindowCopyProgress.js b/src/UI/UIWindowCopyProgress.js
diff --git a/src/UI/UIWindowDownloadDirProg.js b/src/UI/UIWindowDownloadDirProg.js
diff --git a/src/UI/UIWindowDownloadProgress.js b/src/UI/UIWindowDownloadProgress.js
diff --git a/src/UI/UIWindowMoveProgress.js b/src/UI/UIWindowMoveProgress.js