Reorganize data-layer

src/data-layer/helpers.js

@@ -4,7 +4,7 @@ export const formatDate = dateString => {
   return moment(dateString).format("YY-MM-DD, hh:mm:ss");
 };
 
-export const display = value => {
+export const displayValue = value => {
   if (["string", "number"].indexOf(typeof value) < 0) {
     return JSON.stringify(value);
   }

src/data-layer/login.js

@@ -2,7 +2,7 @@
 
 import queryString from "query-string";
 
-import { authSession, authJwt } from "./authentication";
+import { authSession, authJwt } from "./users";
 import { config, removeAuth, setJwtAuth, setApiKeyAuth, cleanAll } from "./setup";
 
 class Login {

src/data-layer/about/index.js → src/data-layer/service/about/origins.js

@@ -1,6 +1,6 @@
 import { origins } from "reactive-data-source";
 
-import { baseConfig } from "../setup";
+import { baseConfig } from "../../setup";
 
 export const about = new origins.Api(
   "/about",

src/data-layer/service/config/origins.js

@@ -0,0 +1,12 @@
+import { origins } from "reactive-data-source";
+
+import { authConfig } from "../../setup";
+
+export const config = new origins.Api(
+  "/config",
+  {},
+  {
+    ...authConfig,
+    defaultValue: {}
+  }
+);

src/data-layer/config/index.js → src/data-layer/service/config/selectors.js

@@ -1,8 +1,7 @@
-import { origins, Selector } from "reactive-data-source";
+import { Selector } from "reactive-data-source";
 
-import { authConfig } from "../setup";
-
-import { display } from "../helpers";
+import { displayValue } from "../../helpers";
+import { config } from "./origins";
 
 const BASE_KEYS = {
   logLevel: "Log Level",
@@ -16,15 +15,6 @@ const BASE_KEYS = {
   auth: "Authentication enabled"
 };
 
-export const config = new origins.Api(
-  "/config",
-  {},
-  {
-    ...authConfig,
-    defaultValue: {}
-  }
-);
-
 export const baseConfig = new Selector(
   config,
   configuration => {
@@ -34,7 +24,7 @@ export const baseConfig = new Selector(
         base.push({
           key: key,
           label: BASE_KEYS[key],
-          value: display(configuration[key]),
+          value: displayValue(configuration[key]),
           originalValue: configuration[key]
         });
       }
@@ -53,7 +43,7 @@ export const customConfig = new Selector(
         custom.push({
           key: key,
           label: key,
-          value: display(configuration[key]),
+          value: displayValue(configuration[key]),
           originalValue: configuration[key]
         });
       }

src/data-layer/service/index.js

@@ -0,0 +1,3 @@
+export * from "./about/origins";
+export * from "./config/origins";
+export * from "./config/selectors";

src/data-layer/abilities/index.js → src/data-layer/services/abilities/origins.js

@@ -1,17 +1,8 @@
 import { origins } from "reactive-data-source";
-import { authConfig } from "../setup";
 
-// ABILITIES COLLECTION
+import { authConfig } from "../../setup";
 
-const ofServiceFilter = serviceId => {
-  if (serviceId) {
-    return {
-      query: {
-        service: serviceId
-      }
-    };
-  }
-};
+// ABILITIES COLLECTION
 
 export const abilitiesCollection = new origins.Api(
   "/abilities",
@@ -23,5 +14,13 @@ export const abilitiesCollection = new origins.Api(
 );
 
 abilitiesCollection.addCustomFilter({
-  ofService: ofServiceFilter
+  ofService: serviceId => {
+    if (serviceId) {
+      return {
+        query: {
+          service: serviceId
+        }
+      };
+    }
+  }
 });

src/data-layer/services/index.js

@@ -1,103 +1,6 @@
-import { origins, Selector } from "reactive-data-source";
-import sortBy from "lodash.sortby";
-
-import { authConfig } from "../setup";
-import { byIdFilter } from "../helpers";
-
-// SERVICES COLLECTION
-
-const typeFilter = serviceType => {
-  if (serviceType && serviceType.length) {
-    return {
-      query: {
-        type: serviceType
-      }
-    };
-  }
-};
-
-export const servicesCollection = new origins.Api(
-  "/services",
-  {},
-  {
-    ...authConfig,
-    defaultValue: []
-  }
-);
-
-servicesCollection.addCustomFilter({
-  type: typeFilter
-});
-
-// SELECTORS
-
-export const modulesCollection = new Selector(
-  {
-    source: servicesCollection,
-    filter: () => typeFilter("module")
-  },
-  servicesResults => servicesResults,
-  []
-);
-
-export const pluginsCollection = new Selector(
-  {
-    source: servicesCollection,
-    filter: () => typeFilter("plugin")
-  },
-  servicesResults => servicesResults,
-  []
-);
-
-const searchByNameAndDesc = (servicesResults, search) => {
-  if (!search) {
-    return servicesResults;
-  }
-  return servicesResults.filter(
-    service => service.name.indexOf(search) > -1 || service.description.indexOf(search) > -1
-  );
-};
-
-export const modulesCollectionFiltered = new Selector(modulesCollection, searchByNameAndDesc, []);
-export const pluginsCollectionFiltered = new Selector(pluginsCollection, searchByNameAndDesc, []);
-
-const sortAndOrderBy = (servicesResults, filter) => {
-  const results = sortBy(servicesResults, (filter && filter.sortBy) || "name");
-  if (filter.reverse) {
-    return results.reverse();
-  }
-  return results;
-};
-
-export const modulesCollectionFilteredAndSorted = new Selector(
-  {
-    source: modulesCollectionFiltered,
-    filter: ({ search }) => search
-  },
-  sortAndOrderBy,
-  []
-);
-
-export const pluginsCollectionFilteredAndSorted = new Selector(
-  {
-    source: pluginsCollectionFiltered,
-    filter: ({ search }) => search
-  },
-  sortAndOrderBy,
-  []
-);
-
-// SERVICE MODEL
-
-export const servicesModel = new origins.Api(
-  "/services/:id",
-  {},
-  {
-    ...authConfig,
-    defaultValue: {}
-  }
-);
-
-servicesModel.addCustomFilter({
-  byId: byIdFilter
-});
+export * from "./abilities/origins";
+export * from "./logs/origins";
+export * from "./logs/selectors";
+export * from "./service/origins";
+export * from "./services/origins";
+export * from "./services/selectors";

src/data-layer/services/logs/origins.js

@@ -0,0 +1,12 @@
+import { origins } from "reactive-data-source";
+
+import { authConfig } from "../../setup";
+
+export const logs = new origins.Api(
+  "/logs",
+  {},
+  {
+    ...authConfig,
+    defaultValue: []
+  }
+);

src/data-layer/logs/index.js → src/data-layer/services/logs/selectors.js

@@ -1,20 +1,12 @@
-import { origins, Selector } from "reactive-data-source";
+import { Selector } from "reactive-data-source";
 
-import { authConfig } from "../setup";
-import { display, formatDate } from "../helpers";
-import { abilitiesCollection } from "../abilities";
-import { servicesCollection } from "../services";
+import { displayValue, formatDate } from "../../helpers";
 
-const NUMBER_OF_LOGS = 100;
+import { abilitiesCollection } from "../abilities/origins";
+import { servicesCollection } from "../services/origins";
+import { logs } from "./origins";
 
-export const logs = new origins.Api(
-  "/logs",
-  {},
-  {
-    ...authConfig,
-    defaultValue: []
-  }
-);
+const NUMBER_OF_LOGS = 100;
 
 export const lastLogs = new Selector(
   logs,
@@ -35,7 +27,7 @@ export const lastLogsDetails = new Selector(
         dateTime: formatDate(log.createdAt),
         module: (service && service.name) || "-",
         ability: (ability && ability.name) || "-",
-        data: display(log.data)
+        data: displayValue(log.data)
       };
     });
   },

src/data-layer/services/service/origins.js

@@ -0,0 +1,20 @@
+import { origins } from "reactive-data-source";
+
+import { authConfig } from "../../setup";
+
+import { byIdFilter } from "../../helpers";
+
+// SERVICE MODELS
+
+export const serviceModels = new origins.Api(
+  "/services/:id",
+  {},
+  {
+    ...authConfig,
+    defaultValue: {}
+  }
+);
+
+serviceModels.addCustomFilter({
+  byId: byIdFilter
+});

src/data-layer/services/services/filters.js

@@ -0,0 +1,9 @@
+export const typeFilter = serviceType => {
+  if (serviceType && serviceType.length) {
+    return {
+      query: {
+        type: serviceType
+      }
+    };
+  }
+};

src/data-layer/services/services/origins.js

@@ -0,0 +1,20 @@
+import { origins } from "reactive-data-source";
+
+import { authConfig } from "../../setup";
+
+import { typeFilter } from "./filters";
+
+// SERVICES COLLECTION
+
+export const servicesCollection = new origins.Api(
+  "/services",
+  {},
+  {
+    ...authConfig,
+    defaultValue: []
+  }
+);
+
+servicesCollection.addCustomFilter({
+  type: typeFilter
+});

src/data-layer/services/services/selectors.js

@@ -0,0 +1,62 @@
+import { Selector } from "reactive-data-source";
+import sortBy from "lodash.sortby";
+
+import { servicesCollection } from "./origins";
+
+import { typeFilter } from "./filters";
+
+export const modulesCollection = new Selector(
+  {
+    source: servicesCollection,
+    filter: () => typeFilter("module")
+  },
+  servicesResults => servicesResults,
+  []
+);
+
+export const pluginsCollection = new Selector(
+  {
+    source: servicesCollection,
+    filter: () => typeFilter("plugin")
+  },
+  servicesResults => servicesResults,
+  []
+);
+
+const searchByNameAndDesc = (servicesResults, search) => {
+  if (!search) {
+    return servicesResults;
+  }
+  return servicesResults.filter(
+    service => service.name.indexOf(search) > -1 || service.description.indexOf(search) > -1
+  );
+};
+
+export const modulesCollectionFiltered = new Selector(modulesCollection, searchByNameAndDesc, []);
+export const pluginsCollectionFiltered = new Selector(pluginsCollection, searchByNameAndDesc, []);
+
+const sortAndOrderBy = (servicesResults, filter) => {
+  const results = sortBy(servicesResults, (filter && filter.sortBy) || "name");
+  if (filter.reverse) {
+    return results.reverse();
+  }
+  return results;
+};
+
+export const modulesCollectionFilteredAndSorted = new Selector(
+  {
+    source: modulesCollectionFiltered,
+    filter: ({ search }) => search
+  },
+  sortAndOrderBy,
+  []
+);
+
+export const pluginsCollectionFilteredAndSorted = new Selector(
+  {
+    source: pluginsCollectionFiltered,
+    filter: ({ search }) => search
+  },
+  sortAndOrderBy,
+  []
+);