lee/puter
1
0
Fork 0
mirror of https://github.com/HeyPuter/puter.git synced 2026-08-27 00:16:44 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

fix: only offer Uninstall for Dashboard apps where it actually sticks

Browse Source 
Uninstall was suppressed via a hardcoded 8-name allowlist that had drifted
out of sync with the backend's ~26 recommended apps. For the ~18 unlisted
recommended apps (Calculator, Code, the games, …) the menu offered
Uninstall, revokeApp resolved, the tile vanished — then get-launch-apps
re-added it on the next load and it reappeared, so the uninstall silently
reverted.

Compute uninstallability from the actual lists: an app is uninstallable
only if it's in the user's installedApps AND not in the recommended list
(and not a protected core app). Recommended apps — installed or not —
resurrect on reload, so Uninstall is hidden for them. Verified live: a
synthetic installed-not-recommended app shows Uninstall; a recommended
app shows none.
This commit is contained in:
jelveh
2026-07-18 14:46:51 -07:00
parent 80979cc27b
commit 1bb5b09d75
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/src/UI/Dashboard/TabApps.js
+22 -6
View File
@@ -73,7 +73,7 @@ function buildTileHtml (app) {
const { title, targetLink } = resolveTileDisplay(app);
const iconUrl = app.iconUrl || window.icons['app.svg'];
let h = `<div class="myapps-tile" data-app-name="${html_encode(app.name)}" data-app-title="${html_encode(title)}" data-app-uid="${html_encode(app.uid || '')}" data-target-link="${html_encode(targetLink)}" title="${html_encode(title)}">`;
let h = `<div class="myapps-tile" data-app-name="${html_encode(app.name)}" data-app-title="${html_encode(title)}" data-app-uid="${html_encode(app.uid || '')}" data-target-link="${html_encode(targetLink)}" data-app-uninstallable="${app.uninstallable ? '1' : '0'}" title="${html_encode(title)}">`;
h += '<div class="myapps-tile-icon">';
h += `<img src="${html_encode(iconUrl)}" alt="" draggable="false">`;
h += '</div>';
@@ -292,10 +292,10 @@ const TabApps = {
const appName = $(this).attr('data-app-name');
const appTitle = $(this).attr('data-app-title');
const appUid = $(this).attr('data-app-uid');
const nameLower = (appName || '').toLowerCase();
const noUninstall = APP_NAMES_NO_UNINSTALL.has(nameLower);
// Only offer Uninstall when it will actually stick (see loadApps).
const canUninstall = $(this).attr('data-app-uninstallable') === '1';
const items = noUninstall
const items = ! canUninstall
? []
: [
{
@@ -943,6 +943,22 @@ const TabApps = {
iconUrl: app.iconUrl || app.icon || null,
}));
// Uninstall only sticks for apps the user actually installed that
// are NOT in the hardcoded recommended list — revokeApp on a
// recommended app does nothing lasting because get-launch-apps
// re-adds it on the next load, so the tile "comes back" and the
// uninstall looks broken. Compute installability against both lists.
const recommendedNames = new Set(
(launchData.recommended || []).map(a => a.name),
);
const installedNames = new Set(
(Array.isArray(installedApps) ? installedApps : []).map(a => a.name),
);
const isUninstallable = name =>
installedNames.has(name)
&& ! recommendedNames.has(name)
&& ! APP_NAMES_NO_UNINSTALL.has((name || '').toLowerCase());
// Build seen set from launch apps
const seen = new Set();
const merged = [];
@@ -950,14 +966,14 @@ const TabApps = {
for ( const app of launchApps ) {
if ( seen.has(app.name) ) continue;
seen.add(app.name);
merged.push(app);
merged.push({ ...app, uninstallable: isUninstallable(app.name) });
}
// Append installed apps that aren't already in the list
for ( const app of installedApps ) {
if ( seen.has(app.name) ) continue;
seen.add(app.name);
merged.push(app);
merged.push({ ...app, uninstallable: isUninstallable(app.name) });
}
// Overlay the user's saved ordering (if any). New apps are appended