Hotfix for app icons and names within settings (#123)

logic/apps.js

@@ -228,5 +228,6 @@ module.exports = {
   get,
   install,
   uninstall,
-  update
+  update,
+  getInstalled
 };

logic/system.js

@@ -5,6 +5,7 @@ const semverMinVersion = require('semver/ranges/min-version');
 const encode = require('lndconnect').encode;
 
 const diskLogic = require('logic/disk.js');
+const appsLogic = require('logic/apps.js');
 const constants = require('utils/const.js');
 const NodeError = require('models/errors.js').NodeError;
 
@@ -381,6 +382,31 @@ async function clearMemoryWarning() {
     }
 };
 
+async function getComputeResourceUsage(resource) {
+    const user = await diskLogic.readUserFile();
+
+    const installedApps = await appsLogic.getInstalled(user);
+
+    const update = await diskLogic.readSystemStatusFile(resource);
+
+    if(Array.isArray(update.breakdown)) {
+        update.breakdown = update.breakdown.map(function(row){
+            if(row.id === 'umbrel') return row;
+
+            const appMetadata = installedApps.find(app => app.id === row.id)
+
+            if(appMetadata) {
+                row.name = appMetadata.name;
+                row.icon = appMetadata.icon;
+            }            
+
+            return row;
+        });
+    }
+
+    return update;
+}
+
 module.exports = {
     getInfo,
     getHiddenServiceUrl,
@@ -400,4 +426,5 @@ module.exports = {
     setRemoteTorAccess,
     status,
     clearMemoryWarning,
+    getComputeResourceUsage
 };

routes/v1/system.js

@@ -122,13 +122,13 @@ router.post('/remote-tor-access', auth.jwt, safeHandler(async (req, res) => {
 }));
 
 router.get('/storage', auth.jwt, safeHandler(async (req, res) => {
-    const update = await diskLogic.readSystemStatusFile('storage');
+    const update = await systemLogic.getComputeResourceUsage('storage');
 
     return res.status(constants.STATUS_CODES.OK).json(update);
 }));
 
 router.get('/memory', auth.jwt, safeHandler(async (req, res) => {
-    const update = await diskLogic.readSystemStatusFile('memory');
+    const update = await systemLogic.getComputeResourceUsage('memory');
 
     return res.status(constants.STATUS_CODES.OK).json(update);
 }));