').text(value).html();
+
+await import('./helpers.js');
+
+describe('determine_website_url', () => {
+ // As puter.hosting.list() returns a site.
+ const site = {
+ subdomain: 'mysite',
+ root_dir: {
+ path: '/alice/Site',
+ subdomains: [{ subdomain: 'mysite', address: 'https://mysite.puter.site' }],
+ },
+ };
+
+ it('gives an item under a published folder its address there', () => {
+ window.sites = [site];
+ expect(window.determine_website_url('/alice/Site/index.html')).toBe('https://mysite.puter.site/index.html');
+ expect(window.determine_website_url('/alice/Site/css/a b.css')).toBe('https://mysite.puter.site/css/a b.css');
+ });
+
+ it('gives none to the folder itself or to anything outside it', () => {
+ window.sites = [site];
+ expect(window.determine_website_url('/alice/Site')).toBeNull();
+ expect(window.determine_website_url('/alice/Sites/index.html')).toBeNull();
+ window.sites = [];
+ expect(window.determine_website_url('/alice/Site/index.html')).toBeNull();
+ });
+});
diff --git a/src/gui/src/helpers.js b/src/gui/src/helpers.js
index dd6126ed7..1e026122d 100644
--- a/src/gui/src/helpers.js
+++ b/src/gui/src/helpers.js
@@ -2166,10 +2166,13 @@ window.refresh_desktop_background = function () {
};
window.determine_website_url = function (fsentry_path) {
- // search window.sites and if any site has `dir_path` set and the fsentry_path starts with that dir_path + '/', return the site's url + path
- for ( let i = 0; i < window.sites.length; i++ ) {
- if ( window.sites[i].dir_path && fsentry_path.startsWith(`${window.sites[i].dir_path }/`) ) {
- return window.sites[i].address + fsentry_path.replace(window.sites[i].dir_path, '');
+ // The address an item has under a site serving a folder above it. The
+ // site's folder and address come with its root_dir.
+ for ( const site of window.sites ) {
+ const dir_path = site.root_dir?.path;
+ const address = site.root_dir?.subdomains?.find((entry) => entry.subdomain === site.subdomain)?.address;
+ if ( dir_path && address && fsentry_path.startsWith(`${dir_path}/`) ) {
+ return address + fsentry_path.slice(dir_path.length);
}
}
@@ -3309,11 +3312,12 @@ window.rename_file = async (options, new_name, old_name, old_path, el_item, el_i
onDone?.(null);
- //show error
- if ( err.message ) {
- UIAlert(err.message);
- }
+ // A network failure rejects with no message, and the name going
+ // back on its own would look like the rename was ignored.
+ UIAlert(err?.message || i18n('error_unknown_cause', [], false));
},
+ }).catch(() => {
+ // Handled by the error callback above.
});
};
diff --git a/src/gui/src/helpers.renameFile.test.js b/src/gui/src/helpers.renameFile.test.js
new file mode 100644
index 000000000..81ac70c9f
--- /dev/null
+++ b/src/gui/src/helpers.renameFile.test.js
@@ -0,0 +1,61 @@
+// @vitest-environment jsdom
+/*
+ * Copyright (C) 2024-present 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
.
+ */
+
+import { describe, expect, it, vi } from 'vitest';
+import jQuery from './lib/jquery-3.6.1/jquery-3.6.1.min.js';
+
+vi.mock('./UI/UIAlert.js', () => ({ default: vi.fn() }));
+vi.mock('./UI/UIItem.js', () => ({ default: vi.fn() }));
+vi.mock('./UI/UIWindowLogin.js', () => ({ default: vi.fn() }));
+vi.mock('./UI/UIWindowProgress.js', () => ({ default: vi.fn() }));
+vi.mock('./UI/UIWindowSaveAccount.js', () => ({ default: vi.fn() }));
+
+globalThis.$ = jQuery;
+globalThis.jQuery = jQuery;
+globalThis.i18n = key => key;
+globalThis.def = globalThis.def ?? (value => value);
+globalThis.use = globalThis.use ?? (() => class {});
+globalThis.html_encode = value => jQuery('
').text(value).html();
+
+await import('./helpers.js');
+const { default: UIAlert } = await import('./UI/UIAlert.js');
+
+describe('rename_file', () => {
+ it('says so when the rename never reaches the server, and leaves no rejection behind', async () => {
+ const failure = new XMLHttpRequest();
+ // Not a vi.fn(), which handles the promises it returns.
+ globalThis.puter = { fs: { rename: ({ error }) => {
+ error(failure);
+ return Promise.reject(failure);
+ } } };
+ const onDone = vi.fn();
+ const unhandled = vi.fn();
+ process.on('unhandledRejection', unhandled);
+
+ await window.rename_file({ uid: 'u1', name: 'a.txt', path: '/alice/a.txt' }, 'b.txt', 'a.txt', '/alice/a.txt',
+ document.createElement('div'), null, null, null, '', false, onDone);
+ await new Promise(resolve => setTimeout(resolve, 0));
+ process.off('unhandledRejection', unhandled);
+
+ expect(onDone).toHaveBeenCalledWith(null);
+ expect(UIAlert).toHaveBeenCalledWith('error_unknown_cause');
+ expect(unhandled).not.toHaveBeenCalled();
+ });
+});
diff --git a/src/gui/src/helpers/forgetParentListing.js b/src/gui/src/helpers/forgetParentListing.js
new file mode 100644
index 000000000..ddb138d68
--- /dev/null
+++ b/src/gui/src/helpers/forgetParentListing.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2024-present 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 .
+ */
+
+import path from '../lib/path.js';
+
+/**
+ * Drops puter.js's cached listing of the folder that holds `item_path`, so
+ * the next listing of it is read fresh. For changes to an item the server
+ * sends no fs event about (a website added to or removed from a folder),
+ * which the cached listing would go on showing the old way.
+ *
+ * @param {string} item_path
+ * @returns {void}
+ */
+export default function forget_parent_listing (item_path) {
+ if ( typeof puter.fsCacheKey !== 'function' || ! puter._cache ) return;
+ puter._cache.del(puter.fsCacheKey('readdir', path.dirname(item_path)));
+}
diff --git a/src/gui/src/i18n/translations/en.js b/src/gui/src/i18n/translations/en.js
index 4aad1d774..93c5c61e2 100644
--- a/src/gui/src/i18n/translations/en.js
+++ b/src/gui/src/i18n/translations/en.js
@@ -610,6 +610,9 @@ const en = {
share_link_anyone_note_write_items:
'Anyone signed in to Puter who has a link to one of these items can view and edit it.',
share_link_mixed_note: 'Some of these items are open to anyone with the link and some are not.',
+ share_link_unchecked: 'Not checked',
+ share_link_unchecked_note:
+ 'Whether this many items are open to anyone with the link isn’t checked. A choice here applies to all {{total}}.',
share_link_on_read: 'Anyone with the link can now view this item',
share_link_on_write: 'Anyone with the link can now edit this item',
share_link_on_read_items: 'Anyone with the link can now view these items',
diff --git a/src/gui/src/keyboard.js b/src/gui/src/keyboard.js
index 9b04ffafb..78e6aff7b 100644
--- a/src/gui/src/keyboard.js
+++ b/src/gui/src/keyboard.js
@@ -911,8 +911,10 @@ $(document).bind('keyup keydown', async function (e) {
// ctrl/command + z, will undo last action
//-----------------------------------------------------------------------------
// Not in a text field, whose own undo is what the user means: the last
- // file action could be an upload, which Undo deletes outright.
- if ( (e.ctrlKey || e.metaKey) && e.which === 90 && ! $(focused_el).is('input, textarea, [contenteditable]') ) {
+ // file action could be an upload, which Undo deletes outright. Once per
+ // press: releasing Z with Ctrl/Cmd still held would undo a second action.
+ if ( (e.ctrlKey || e.metaKey) && e.which === 90 && e.type === 'keydown'
+ && ! $(focused_el).is('input, textarea, [contenteditable]') ) {
window.undo_last_action();
return false;
}
diff --git a/src/gui/src/keyboard.undo.test.js b/src/gui/src/keyboard.undo.test.js
new file mode 100644
index 000000000..657cbdcef
--- /dev/null
+++ b/src/gui/src/keyboard.undo.test.js
@@ -0,0 +1,46 @@
+// @vitest-environment jsdom
+/*
+ * Copyright (C) 2024-present 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 .
+ */
+
+import { describe, expect, it, vi } from 'vitest';
+import jQuery from './lib/jquery-3.6.1/jquery-3.6.1.min.js';
+
+vi.mock('./UI/UIAlert.js', () => ({ default: vi.fn() }));
+vi.mock('./UI/UIWindowSearch.js', () => ({ default: vi.fn() }));
+vi.mock('./helpers/launchApp.js', () => ({ default: vi.fn() }));
+vi.mock('./helpers/openItem.js', () => ({ default: vi.fn() }));
+
+globalThis.$ = jQuery;
+globalThis.jQuery = jQuery;
+globalThis.i18n = key => key;
+globalThis.def = globalThis.def ?? (value => value);
+globalThis.use = globalThis.use ?? (() => class {});
+
+await import('./keyboard.js');
+
+describe('Ctrl/Cmd+Z', () => {
+ it('undoes one action per press', () => {
+ window.undo_last_action = vi.fn();
+ const z = { key: 'z', keyCode: 90, which: 90, metaKey: true, bubbles: true };
+ document.body.dispatchEvent(new KeyboardEvent('keydown', z));
+ // Z let go before Cmd.
+ document.body.dispatchEvent(new KeyboardEvent('keyup', z));
+ expect(window.undo_last_action).toHaveBeenCalledTimes(1);
+ });
+});