more usage of dialogContext in FileDialog

wellenvogel · Jan 9, 2025 · f28583c · f28583c
1 parent 6590237
commit f28583c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/viewer/components/FileDialog.jsx b/viewer/components/FileDialog.jsx
@@ -108,7 +108,7 @@ const getDownloadUrl=(item)=>{
 }
 
 const showConvertFunctions = {
-    track: (history,item) => {
+    track: (dialogContext,history,item) => {
         TrackConvertDialog.showDialog(history,item.name);
     }
 }
@@ -759,11 +759,9 @@ export const FileDialogWithActions=(props)=>{
         }
         if (action === 'userapp'){
             if (item.url) {
-                showPromiseDialog(undefined, (props) =>
-                    <UserAppDialog {...props} fixed={{url: item.url}}/>
-                )
-                    .then((data) => doneAction())
-                    .catch((error) => doneAction());
+                dialogContext.replaceDialog((props) =>
+                    <UserAppDialog {...props} fixed={{url: item.url}} resolveFunction={()=>{}}/>
+                ,()=>doneAction())
             }
         }
         if (action === 'delete'){
@@ -789,7 +787,7 @@ export const FileDialogWithActions=(props)=>{
         if ( action === 'convert'){
             let convertFunction=showConvertFunctions[newItem.type];
             if (convertFunction){
-                convertFunction(history,newItem);
+                convertFunction(dialogContext,history,newItem);
             }
             return;
         }

diff --git a/viewer/components/UserAppDialog.jsx b/viewer/components/UserAppDialog.jsx
@@ -446,7 +446,7 @@ const UserAppDialog = (props) => {
 UserAppDialog.propTypes = {
     fixed: PropTypes.object.isRequired,
     addon: PropTypes.object,
-    resolveFunction: PropTypes.func
+    resolveFunction: PropTypes.func.isRequired
 };
 
 export default UserAppDialog;