Address pr coments

trento-project · Sep 27, 2023 · 0585125 · 0585125
1 parent 4228bc1
commit 0585125
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 21 deletions.
diff --git a/assets/js/components/HostDetails/HostDetailsPage.jsx b/assets/js/components/HostDetails/HostDetailsPage.jsx
@@ -51,6 +51,7 @@ function HostDetailsPage() {
   if (!host) {
     return <div>Not Found</div>;
   }
+
   return (
     <HostDetails
       agentVersion={host.agent_version}

diff --git a/assets/js/components/SaptuneDetails/SaptuneDetails.jsx b/assets/js/components/SaptuneDetails/SaptuneDetails.jsx
@@ -45,7 +45,7 @@ const renderNotes = (notes) => {
 const renderSolution = ({ id, notes, partial }) => (
   <span>
     {id} ({renderNotes(notes)}
-    {partial ? ' -> Partial' : ''})
+    {partial ? '-> Partial' : ''})
   </span>
 );
 

diff --git a/assets/js/components/SaptuneDetails/SaptuneDetails.stories.jsx b/assets/js/components/SaptuneDetails/SaptuneDetails.stories.jsx
@@ -74,7 +74,7 @@ export default {
       description: 'Services',
     },
     staging: {
-      control: 'array',
+      control: 'object',
       description: 'Staging',
     },
     tuningState: {

diff --git a/assets/js/lib/test-utils/factories/hosts.js b/assets/js/lib/test-utils/factories/hosts.js
@@ -39,7 +39,10 @@ export const slesSubscriptionFactory = Factory.define(() => ({
 
 const sapNoteID = () => faker.number.int({ min: 100000, max: 999999 });
 
-const sapNotesList = (count = 6) => Array(count).fill(sapNoteID());
+const sapNotesList = (count = 6) =>
+  Array(count)
+    .fill(null)
+    .map(() => sapNoteID());
 
 const saptuneServiceActiveEnum = () =>
   faker.helpers.arrayElement(['enabled', 'disabled', null]);
@@ -60,9 +63,9 @@ const saptuneServiceFactory = Factory.define(() => ({
 }));
 
 const saptuneStagingFactory = Factory.define(() => ({
-  enabled: faker.datatype.boolean(),
-  notes: sapNotesList(),
-  solutions_ids: sapNotesList(),
+  enabled: true,
+  notes: sapNotesList(3),
+  solutions_ids: [saptuneSolutionNameEnum()],
 }));
 
 const saptuneNoteFactory = Factory.define(() => ({
@@ -76,22 +79,27 @@ const saptuneSolutionFactory = Factory.define(() => ({
   partial: faker.datatype.boolean(),
 }));
 
-export const saptuneStatusFactory = Factory.define(() => ({
-  applied_notes: sapNotesList().map((id) => saptuneNoteFactory.build({ id })),
-  applied_solution: saptuneSolutionFactory.build(),
-  configured_version: faker.number.int({ min: 1, max: 3 }),
-  enabled_notes: sapNotesList().map((id) => saptuneNoteFactory.build({ id })),
-  enabled_solution: saptuneSolutionFactory.build(),
-  package_version: faker.system.semver(),
-  services: [
-    saptuneServiceFactory.build({ name: 'sapconf' }),
-    saptuneServiceFactory.build({ name: 'saptune' }),
-    saptuneServiceFactory.build({ name: 'tuned' }),
-  ],
-  staging: saptuneStagingFactory.build(),
-  tuning_state: saptuneTuningStateEnum(),
-}));
+export const saptuneStatusFactory = Factory.define(() => {
+  const solution = saptuneSolutionFactory.build();
+  const { notes } = solution;
+  const allNotes = notes.map((id) => saptuneNoteFactory.build({ id }));
 
+  return {
+    applied_notes: allNotes,
+    applied_solution: solution,
+    configured_version: faker.number.int({ min: 1, max: 3 }),
+    enabled_notes: allNotes,
+    enabled_solution: solution,
+    package_version: faker.system.semver(),
+    services: [
+      saptuneServiceFactory.build({ name: 'sapconf' }),
+      saptuneServiceFactory.build({ name: 'saptune' }),
+      saptuneServiceFactory.build({ name: 'tuned' }),
+    ],
+    staging: saptuneStagingFactory.build(3),
+    tuning_state: saptuneTuningStateEnum(),
+  };
+});
 export const hostFactory = Factory.define(({ params, sequence }) => {
   const id = params.id || faker.string.uuid();