Support for app categories in docker integration (#8)

* initial support for app categories in docker integration

* fixed readme examples for docker integration and some fixes to integration

* fix obtaining category from container label

* hide edit actions for default categories (such as Docker)

controllers/apps.js

@@ -5,6 +5,8 @@ const Config = require('../models/Config');
 const { Sequelize } = require('sequelize');
 const axios = require('axios');
 const Logger = require('../utils/Logger');
+const Category = require('../models/Category');
+const { dockerDefaultCategory } = require('./category');
 const logger = new Logger();
 const k8s = require('@kubernetes/client-node');
 
@@ -89,7 +91,18 @@ exports.getApps = asyncWrapper(async (req, res, next) => {
         order: [[orderType, 'ASC']],
       });
 
+<<<<<<< HEAD
       containers = containers.filter((e) => Object.keys(e.Labels).length !== 0);
+=======
+      const categories = await Category.findAll({
+        where: {
+          type: 'apps'
+        },
+        order: [[orderType, 'ASC']]
+      });
+
+      containers = containers.filter(e => Object.keys(e.Labels).length !== 0);
+>>>>>>> e1a46b7 (Support for app categories in docker integration (#8))
       const dockerApps = [];
       for (const container of containers) {
         const labels = container.Labels;
@@ -99,6 +112,7 @@ exports.getApps = asyncWrapper(async (req, res, next) => {
           'flame.url' in labels &&
           /^app/.test(labels['flame.type'])
         ) {
+<<<<<<< HEAD
           for (let i = 0; i < labels['flame.name'].split(';').length; i++) {
             const names = labels['flame.name'].split(';');
             const urls = labels['flame.url'].split(';');
@@ -114,6 +128,19 @@ exports.getApps = asyncWrapper(async (req, res, next) => {
               icon: icons[i] || 'docker',
             });
           }
+=======
+          const app = {
+            name: labels['flame.name'],
+            url: labels['flame.url'],
+            icon: labels['flame.icon'] || 'docker',
+            categoryId: dockerDefaultCategory.id
+          }
+          if (labels['flame.category']) {
+            const category = categories.find(category => category.name.toUpperCase() === labels['flame.category'].toUpperCase());
+            app.categoryId = category ? category.id : dockerDefaultCategory.id
+          }
+          dockerApps.push(app);
+>>>>>>> e1a46b7 (Support for app categories in docker integration (#8))
         }
       }
 

controllers/category.js

@@ -5,6 +5,14 @@ const Bookmark = require('../models/Bookmark');
 const Config = require('../models/Config');
 const { Sequelize } = require('sequelize');
 
+exports.dockerDefaultCategory = {
+  id: -2,
+  name: "Docker",
+  type: "apps",
+  isPinned: true,
+  orderId: 99,
+};
+
 // @desc      Create new category
 // @route     POST /api/categories
 // @access    Public
@@ -73,6 +81,7 @@ exports.getCategories = asyncWrapper(async (req, res, next) => {
       ],
       order: [[orderType, 'ASC']],
     });
+    categories.push(exports.dockerDefaultCategory);
   }
 
   res.status(200).json({
@@ -100,12 +109,16 @@ exports.getCategory = asyncWrapper(async (req, res, next) => {
   });
 
   if (!category) {
-    return next(
-      new ErrorResponse(
-        `Category with id of ${req.params.id} was not found`,
-        404
-      )
-    );
+    if (req.params.id === exports.dockerDefaultCategory.id) {
+      category = exports.dockerDefaultCategory;
+    } else {
+      return next(
+        new ErrorResponse(
+          `Category with id of ${req.params.id} was not found`,
+          404
+        )
+      );
+    }
   }
 
   res.status(200).json({