fix: added subsystems to the logdetail view

Author: DdeHoog

lib/database/adapters/LogAdapter.js

@@ -12,6 +12,7 @@
  */
 
 const TagAdapter = require('./TagAdapter');
+const SubsystemAdapter = require('./SubsystemAdapter');
 const UserAdapter = require('./UserAdapter');
 
 /**
@@ -32,6 +33,7 @@ class LogAdapter {
             createdAt,
             origin,
             subtype,
+            subsystems,
             text,
             user,
             rootLogId,
@@ -55,6 +57,11 @@ class LogAdapter {
         } else {
             entityObject.tags = [];
         }
+        if (subsystems) {
+            entityObject.subsystems = subsystems.map(SubsystemAdapter.toEntity);
+        } else {
+            entityObject.subsystems = [];
+        }
 
         return entityObject;
     }

lib/database/repositories/LogRepository.js

@@ -42,6 +42,8 @@ class LogRepository extends Repository {
     async findAllBySubsystemId(subsystemId, queryBuilder = new QueryBuilder()) {
         queryBuilder
             .setModel(Log)
+            .include('user')
+            .include('tags')
             .whereAssociation('subsystems', 'id').is(subsystemId);
 
         return this.findAll(queryBuilder);

lib/public/components/Post/index.js

@@ -31,6 +31,7 @@ const ACTIVE_FIELDS = {
     subsystems: {
         name: 'Subsystems',
         visible: true,
+        format: (subsystems) => subsystems.map(({ name }) => name).join(', '),
     },
     origin: {
         name: 'Class',

lib/public/views/Subsystems/Details/index.js

@@ -55,7 +55,7 @@ const subsystemDetails = (model) => {
                             cursor: 'pointer',
                         },
                         onclick: () => model.router.go(`?page=entry&id=${entry.id}`),
-                    })),
+                    }), model),
                     Failure: (payload) => payload.map((error) => h('.alert.alert-danger', error.title)),
                 }),
             },

lib/public/views/Subsystems/Overview/index.js

@@ -46,7 +46,7 @@ const subsystemOverview = (model) => {
             Success: (payload) => table(payload, ACTIVE_COLUMNS, (entry) => ({
                 style: 'cursor: pointer;',
                 onclick: () => model.router.go(`?page=subsystem&id=${entry.id}`),
-            })),
+            }), model),
             Failure: (payload) => payload.map((error) => h('.alert.alert-danger', error.title)),
         }),
     ];

lib/usecases/log/GetAllLogsUseCase.js

@@ -60,6 +60,7 @@ class GetAllLogsUseCase {
         Object.keys(sort).forEach((s) => queryBuilder.orderBy(s, sort[s]));
 
         queryBuilder.include('tags');
+        queryBuilder.include('subsystems');
         queryBuilder.include('user');
 
         const {

lib/usecases/log/GetLogUseCase.js

@@ -43,6 +43,7 @@ class GetLogUseCase {
         const queryBuilder = new QueryBuilder()
             .include('tags')
             .include('user')
+            .include('subsystems')
             .where('id').is(logId);
 
         const log = await TransactionHelper.provide(() => LogRepository.findOne(queryBuilder));

lib/usecases/subsystem/GetLogsBySubsystemUseCase.js

@@ -11,6 +11,11 @@
  * or submit itself to any jurisdiction.
  */
 
+const {
+    adapters: {
+        LogAdapter,
+    },
+} = require('../../domain');
 const {
     repositories: {
         LogRepository,
@@ -38,10 +43,11 @@ class GetLogsBySubsystemUseCase {
         const { subsystemId } = params;
 
         queryBuilder.where('id').is(subsystemId);
-        return TransactionHelper.provide(async () => {
+        const logs = await TransactionHelper.provide(async () => {
             const subsystem = await SubsystemRepository.findOne(queryBuilder);
             return subsystem ? LogRepository.findAllBySubsystemId(subsystem.id) : null;
         });
+        return logs ? logs.map(LogAdapter.toEntity) : null;
     }
 }