fix logs height in popup

kubero-dev · Jul 20, 2024 · aa1aa98 · aa1aa98
1 parent 8091362
commit aa1aa98
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 75 deletions.
diff --git a/client/src/components/apps/builds.vue b/client/src/components/apps/builds.vue
@@ -117,7 +117,7 @@
                         </v-row>
                         <v-expand-transition>
                             <v-row v-if="b.metadata.name == activeLogs">
-                                <Logs :pipeline=pipeline :phase=phase :app=app :deploymentstrategy=appData?.spec.deploymentstrategy logType="buildlogs" :buildID="b.metadata.name"/>
+                                <Logs :pipeline=pipeline :phase=phase :app=app :deploymentstrategy=appData?.spec.deploymentstrategy logType="buildlogs" :buildID="b.metadata.name" height="400px"/>
                             </v-row>
                         </v-expand-transition>
                     </v-card-text>

diff --git a/client/src/components/apps/logs.vue b/client/src/components/apps/logs.vue
@@ -1,5 +1,5 @@
 <template>
-    <div style="height: 600px; width: 100%;">
+    <div :style="'height: ' + height + '; width: 100%;'">
         <v-tabs class="console-bar" style="position: relative; z-index: 3000;">
             <v-tab v-if="logType == 'runlogs'" @click="getLogHistory('web')">run</v-tab>
             <v-tab v-if="logType == 'runlogs' && deploymentstrategy == 'git' && buildstrategy=='plain'" @click="getLogHistory('builder')">build</v-tab>
@@ -97,6 +97,10 @@ export default defineComponent({
         type: String,
         default: "MISSING"
       },
+      height: {
+        type: String,
+        default: "100%"
+      },
     },
     data: () => ({
         loglines: [

diff --git a/client/src/components/apps/logstab.vue b/client/src/components/apps/logstab.vue
@@ -21,7 +21,7 @@
         </v-row>
         <v-row>
             <v-col cols="12" sm="12" md="12">
-                <Logs :pipeline=pipeline :phase=phase :app=app :deploymentstrategy=deploymentstrategy logType="runlogs"/>
+                <Logs :pipeline=pipeline :phase=phase :app=app :deploymentstrategy=deploymentstrategy logType="runlogs" height="600px"/>
             </v-col>
         </v-row>
 

diff --git a/server/src/modules/deployments.ts b/server/src/modules/deployments.ts
@@ -140,78 +140,6 @@ export class Deployments {
               // load jobn details
               const job = await this.kubectl.getJob(namespace, `${deployment.spec.app}-${deployment.spec.pipeline}-${deployment.spec.id}`) //TODO: Naming might change, since it is the wrong order
               if (job) {
-                /*
-[1]   status: V1JobStatus {
-[1]     active: undefined,
-[1]     completedIndexes: undefined,
-[1]     completionTime: 2024-07-12T20:05:05.000Z,
-[1]     conditions: [ [V1JobCondition] ],
-[1]     failed: 1,
-[1]     failedIndexes: undefined,
-[1]     ready: 0,
-[1]     startTime: 2024-07-12T20:02:53.000Z,
-[1]     succeeded: 1,
-[1]     terminating: 0,
-[1]     uncountedTerminatedPods: V1UncountedTerminatedPods {
-[1]       failed: undefined,
-[1]       succeeded: undefined
-[1]     }
-[1]   }
-[1] }
-
-[1]   status: V1JobStatus {
-[1]     active: 1,
-[1]     completedIndexes: undefined,
-[1]     completionTime: undefined,
-[1]     conditions: undefined,
-[1]     failed: 1,
-[1]     failedIndexes: undefined,
-[1]     ready: 0,
-[1]     startTime: 2024-07-13T12:21:27.000Z,
-[1]     succeeded: undefined,
-[1]     terminating: 0,
-[1]     uncountedTerminatedPods: V1UncountedTerminatedPods {
-[1]       failed: undefined,
-[1]       succeeded: undefined
-[1]     }
-[1]   }
-[1] }
-
-[1]   status: V1JobStatus {
-[1]     active: undefined,
-[1]     completedIndexes: undefined,
-[1]     completionTime: undefined,
-[1]     conditions: [ [V1JobCondition] ],
-[1]     failed: 2,
-[1]     failedIndexes: undefined,
-[1]     ready: 0,
-[1]     startTime: 2024-07-13T12:21:27.000Z,
-[1]     succeeded: undefined,
-[1]     terminating: 0,
-[1]     uncountedTerminatedPods: V1UncountedTerminatedPods {
-[1]       failed: undefined,
-[1]       succeeded: undefined
-[1]     }
-[1]   }
-[1] }
-
-[1]   status: V1JobStatus {
-[1]     active: 1,
-[1]     completedIndexes: undefined,
-[1]     completionTime: undefined,
-[1]     conditions: undefined,
-[1]     failed: undefined,
-[1]     failedIndexes: undefined,
-[1]     ready: 0,
-[1]     startTime: 2024-07-13T12:21:27.000Z,
-[1]     succeeded: undefined,
-[1]     terminating: 0,
-[1]     uncountedTerminatedPods: V1UncountedTerminatedPods {
-[1]       failed: undefined,
-[1]       succeeded: undefined
-[1]     }
-[1]   }
-                */
                 const duration = new Date(job.status.completionTime).getTime() - new Date(job.status.startTime).getTime()
 
                 let status: "Unknown" | "Active" | "Succeeded" | "Failed" = 'Unknown'