rowan/multi-account-containers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added unsort tabs functionality

Browse source
This commit is contained in:
jaharon33 2025-03-15 14:49:23 -07:00
parent 546ee7a098
commit cff5a432f6
7 changed files with 81 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
package-lock.json generated
View file

@ -1,12 +1,12 @@
{
"name": "testpilot-containers",
"version": "8.1.3",
"version": "8.2.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "testpilot-containers",
"version": "8.1.1",
"version": "8.2.0",
"license": "MPL-2.0",
"devDependencies": {
"addons-linter": "^5.28.0",
@ -15032,8 +15032,7 @@
"version": "5.3.2",
"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
"dev": true,
"requires": {}
"dev": true
},
"acorn-walk": {
"version": "7.2.0",
@ -17246,15 +17245,13 @@
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-4.0.2.tgz",
"integrity": "sha512-Pry0S9YmHoz8NCEMRQh7N0Yexh2MYCNPIlrV52hTmS7qXnTghWsjXouF08bgsrrZqaW9tt1ZiK3j5NEmPE+EjQ==",
"dev": true,
"requires": {}
"dev": true
},
"eslint-plugin-promise": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.2.0.tgz",
"integrity": "sha512-SftLb1pUG01QYq2A/hGAWfDRXqYD82zE7j7TopDOyNdU+7SvvoXREls/+PRTY17vUXzXnZA/zfnyKgRH6x4JJw==",
"dev": true,
"requires": {}
"dev": true
},
"eslint-scope": {
"version": "5.1.1",
@ -19763,8 +19760,7 @@
"version": "7.5.9",
"resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
"integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
"dev": true,
"requires": {}
"dev": true
}
}
},
@ -21971,8 +21967,7 @@
"version": "0.36.2",
"resolved": "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz",
"integrity": "sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==",
"dev": true,
"requires": {}
"dev": true
},
"postcss-value-parser": {
"version": "4.2.0",
@ -22826,8 +22821,7 @@
"version": "3.7.0",
"resolved": "https://registry.npmjs.org/sinon-chai/-/sinon-chai-3.7.0.tgz",
"integrity": "sha512-mf5NURdUaSdnatJx3uhoBOrY9dtL19fiOtAdT1Azxg3+lNJFiuN0uzaU3xX1LeAfL17kHQhTAJgpsfhbMJMY2g==",
"dev": true,
"requires": {}
"dev": true
},
"slash": {
"version": "3.0.0",
@ -23571,8 +23565,7 @@
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz",
"integrity": "sha512-F6yTRuc06xr1h5Qw/ykb2LuFynJ2IxkKfCMf+1xqPffkxh0S09Zc902XCffcsw/XMFq/OzQ1w54fLIDtmRNHnQ==",
"dev": true,
"requires": {}
"dev": true
},
"stylelint-config-standard": {
"version": "20.0.0",
@ -24946,8 +24939,7 @@
"version": "8.12.0",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz",
"integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==",
"dev": true,
"requires": {}
"dev": true
},
"xdg-basedir": {
"version": "5.1.0",

5
src/js/background/assignManager.js
View file

@ -61,8 +61,9 @@ window.assignManager = {
this.area.get([siteStoreKey]).then((storageResponse) => {
if (storageResponse && siteStoreKey in storageResponse) {
resolve(storageResponse[siteStoreKey]);
} else {
resolve(null);
}
resolve(null);
}).catch((e) => {
reject(e);
});
@ -638,7 +639,7 @@ window.assignManager = {
},
async _maybeRemoveSiteIsolation(userContextId) {
const assignments = await this.storageArea.getByContainer(userContextId);
const assignments = await this.storageArea.getAssignedSites(userContextId);
const hasAssignments = assignments && Object.keys(assignments).length > 0;
if (hasAssignments) {
return;

39
src/js/background/backgroundLogic.js
View file

@ -4,6 +4,8 @@
const DEFAULT_TAB = "about:newtab";
// let originalTabs = [];
const backgroundLogic = {
NEW_TAB_PAGES: new Set([
"about:startpage",
@ -328,13 +330,40 @@ const backgroundLogic = {
await Promise.all(identitiesPromise);
return identitiesOutput;
},
async unsortTabs() {
const windowObj = await browser.windows.getCurrent();
await this._unsortTabsInternal(windowObj);
localStorage.removeItem("originalTabs");
},
async sortTabs() {
const windows = await browser.windows.getAll();
for (let windowObj of windows) { // eslint-disable-line prefer-const
// First the pinned tabs, then the normal ones.
await this._sortTabsInternal(windowObj, true);
await this._sortTabsInternal(windowObj, false);
const windowObj = await browser.windows.getCurrent();
const tabs = await browser.tabs.query({windowId: windowObj.id});
for (const tab of tabs){
if(!(windowObj.id in ORIGINAL_TABS)){
ORIGINAL_TABS[windowObj.id] = [];
}
ORIGINAL_TABS[windowObj.id].push(tab.id);
}
let jsonarray = JSON.stringify(ORIGINAL_TABS);
localStorage.setItem("originalTabs", jsonarray);
// First the pinned tabs, then the normal ones.
await this._sortTabsInternal(windowObj, true);
await this._sortTabsInternal(windowObj, false);
},
async _unsortTabsInternal(windowObj){
let pos = 0;
let parsedOriginalTabs = JSON.parse(localStorage.getItem("originalTabs"));
let windowSpecificOriginalTabs = parsedOriginalTabs[windowObj.id];
for (const tab of windowSpecificOriginalTabs) {
++pos;
browser.tabs.move(tab, {
windowId: windowObj.id,
index: pos
});
}
},

3
src/js/background/messageHandler.js
View file

@ -54,6 +54,9 @@ const messageHandler = {
case "sortTabs":
backgroundLogic.sortTabs();
break;
case "unsortTabs":
backgroundLogic.unsortTabs();
break;
case "showTabs":
backgroundLogic.unhideContainer(m.cookieStoreId);
break;

21
src/js/popup.js
View file

@ -766,6 +766,17 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
window.close();
}
});
Utils.addEnterHandler(document.querySelector("#unsort-containers-link"), async () => {
try {
await browser.runtime.sendMessage({
method: "unsortTabs"
});
window.close();
} catch (e) {
window.close();
}
});
const mozillaVpnToutName = "moz-tout-main-panel";
const mozillaVpnPermissionsWarningDotName = "moz-permissions-warning-dot";
@ -911,6 +922,16 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
document.addEventListener("input", Logic.filterContainerList);
MozillaVPN.handleContainerList(identities);
// document.querySelector("#unsort-containers-link").setAttribute("disabled", "true");
if (localStorage.getItem("originalTabs") == null){
document.querySelector("#unsort-containers-link").setAttribute("disabled", "true");
}
else {
document.querySelector("#unsort-containers-link").removeAttribute("disabled");
}
// console.log(localStorage.getItem("originalTabs"));
// reset path
this._previousPanelPath = [];

1
src/js/utils.js
View file

@ -4,6 +4,7 @@ const DEFAULT_FAVICON = "/img/blank-favicon.svg";
// eslint-disable-next-line
const CONTAINER_ORDER_STORAGE_KEY = "container-order";
const ORIGINAL_TABS = {};
// TODO use export here instead of globals
const Utils = {

9
src/popup.html
View file

@ -140,6 +140,15 @@
</span>
</td>
</tr>
<tr class="menu-item hover-highlight keyboard-nav" id="unsort-containers-link" tabindex="0">
<td>
<img class="menu-icon" alt="" src="/img/sort-16_1.svg" />
<span class="menu-text" data-i18n-message-id="unsortTabsByContainer"></span>
<span class="menu-arrow">
</span>
</td>
</tr>
<tr class="menu-item hover-highlight keyboard-nav" id="always-open-in" tabindex="0">
<td>
<img class="menu-icon" alt="" src="/img/container-openin-16.svg" />