mirrors/puter
1
0
Fork 0
mirror of https://github.com/HeyPuter/puter synced 2024-11-15 06:15:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Replace UIWindowMoveProgress with UIWindowProgress

Browse Source
This commit is contained in:
Sam Atkins 2024-05-09 18:18:27 +01:00
parent cb6c098f95
commit c12312cbd3
2 changed files with 9 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/UI/UIWindowMoveProgress.js
View File

@ -1,81 +0,0 @@
/**
* Copyright (C) 2024 Puter Technologies Inc.
*
* This file is part of Puter.
*
* Puter is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import UIWindow from './UIWindow.js'
// todo do this using uid rather than item_path, since item_path is way mroe expensive on the DB
async function UIWindowMoveProgress(options){
let h = '';
h += `<div data-move-operation-id="${html_encode(options.operation_id)}">`;
h += `<div>`;
// spinner
h +=`<svg style="float:left; margin-right: 7px;" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24"><title>circle anim</title><g fill="#212121" class="nc-icon-wrapper"><g class="nc-loop-circle-24-icon-f"><path d="M12 24a12 12 0 1 1 12-12 12.013 12.013 0 0 1-12 12zm0-22a10 10 0 1 0 10 10A10.011 10.011 0 0 0 12 2z" fill="#212121" opacity=".4"></path><path d="M24 12h-2A10.011 10.011 0 0 0 12 2V0a12.013 12.013 0 0 1 12 12z" data-color="color-2"></path></g><style>.nc-loop-circle-24-icon-f{--animation-duration:0.5s;transform-origin:12px 12px;animation:nc-loop-circle-anim var(--animation-duration) infinite linear}@keyframes nc-loop-circle-anim{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}</style></g></svg>`;
// Progress report
h +=`<div style="margin-bottom:20px; float:left; padding-top:3px; font-size:15px; overflow: hidden; width: calc(100% - 40px); text-overflow: ellipsis; white-space: nowrap;">`;
// msg
h += `<span class="move-progress-msg">${i18n('moving')} </span>`;
h += `<span class="move-from" style="font-weight:strong;"></span>`;
h += `</div>`;
// progress
h += `<div class="move-progress-bar-container" style="clear:both; margin-top:20px; border-radius:3px;">`;
h += `<div class="move-progress-bar"></div>`;
h += `</div>`;
// cancel
// h += `<button style="float:right; margin-top: 15px; margin-right: -2px;" class="button button-small move-cancel-btn">Cancel</button>`;
h +=`</div>`;
h += `</div>`;
const el_window = await UIWindow({
title: `moveing`,
icon: window.icons[`app-icon-moveing.svg`],
uid: null,
is_dir: false,
body_content: h,
has_head: false,
selectable_body: false,
draggable_body: true,
allow_context_menu: false,
is_resizable: false,
is_droppable: false,
init_center: true,
allow_native_ctxmenu: false,
allow_user_select: false,
window_class: 'window-move-progress',
width: 450,
dominant: true,
window_css:{
height: 'initial',
},
body_css: {
padding: '22px',
width: 'initial',
'background-color': 'rgba(231, 238, 245, .95)',
'backdrop-filter': 'blur(3px)',
}
});
$(el_window).find('.move-cancel-btn').on('click', function(e){
window.operation_cancelled[options.operation_id] = true;
$(el_window).close();
})
return el_window;
}
export default UIWindowMoveProgress

14
src/helpers.js
View File

@ -25,7 +25,6 @@ import UIWindow from './UI/UIWindow.js'
import UIWindowLogin from './UI/UIWindowLogin.js';
import UIWindowSaveAccount from './UI/UIWindowSaveAccount.js';
import UIWindowCopyProgress from './UI/UIWindowCopyProgress.js';
import UIWindowMoveProgress from './UI/UIWindowMoveProgress.js';
import update_username_in_gui from './helpers/update_username_in_gui.js';
import update_title_based_on_uploads from './helpers/update_title_based_on_uploads.js';
import content_type_to_icon from './helpers/content_type_to_icon.js';
@ -2132,7 +2131,12 @@ window.move_items = async function(el_items, dest_path, is_undo = false){
// only show progress window if it takes longer than 2s to move
let progwin;
let progwin_timeout = setTimeout(async () => {
progwin = await UIWindowMoveProgress({operation_id: move_op_id});
progwin = await UIWindowProgress({
operation_id: move_op_id,
on_cancel: () => {
window.operation_cancelled[move_op_id] = true;
},
});
}, 2000);
// storing moved items for undo ability
@ -2218,7 +2222,7 @@ window.move_items = async function(el_items, dest_path, is_undo = false){
// moving an item into a trashed directory? deny.
else if(dest_path.startsWith(window.trash_path)){
$(progwin).close();
progwin?.close();
UIAlert('Cannot move items into a deleted folder.');
return;
}
@ -2237,7 +2241,7 @@ window.move_items = async function(el_items, dest_path, is_undo = false){
// --------------------------------------------------------
// update progress window with current item being moved
// --------------------------------------------------------
$(progwin).find('.move-from').html(html_encode(path_to_show_on_progwin));
progwin?.set_status(i18n('moving') + ' ' + html_encode(path_to_show_on_progwin));
// execute move
let resp = await puter.fs.move({
@ -2444,7 +2448,7 @@ window.move_items = async function(el_items, dest_path, is_undo = false){
if(progwin){
setTimeout(() => {
$(progwin).close();
progwin.close();
}, window.copy_progress_hide_delay);
}
}