Fixed Download Event Logs and Informational Logs (#115)

- Error log download was failing when informational error logs were present. Fixed it in this change.
- Defect: https://jazz07.rchland.ibm.com:13443/jazz/web/projects/CSSD#action=com.ibm.team.workitem.viewWorkItem&id=459205

Signed-off-by: Nikhil Ashoka <[email protected]>

Author: Nikhil-Ashoka

src/store/modules/Logs/EventLogStore.js

@@ -260,27 +260,10 @@ const EventLogStore = {
           throw new Error(i18n.t('pageEventLogs.toast.errorLogStatusUpdate'));
         });
     },
-    async downloadCELogData(_, eventId) {
-      return await api
-        .get(
-          `/redfish/v1/Systems/system/LogServices/CELog/Entries/` +
-            eventId +
-            `/OemPelAttachment`
-        )
-        .then((response) => {
-          return response?.data?.Oem?.IBM?.PelJson;
-        });
-    },
-    async downloadEventLogData(_, eventId) {
-      return await api
-        .get(
-          `/redfish/v1/Systems/system/LogServices/EventLog/Entries/` +
-            eventId +
-            `/OemPelAttachment`
-        )
-        .then((response) => {
-          return response?.data?.Oem?.IBM?.PelJson;
-        });
+    async downloadLogData(_, uri) {
+      return await api.get(uri + `/OemPelAttachment`).then((response) => {
+        return response?.data?.Oem?.IBM?.PelJson;
+      });
     },
   },
 };

src/views/Logs/EventLogs/EventLogs.vue

@@ -578,7 +578,7 @@ export default {
         return this.sortStatus(a, b, key);
       }
     },
-    onTableRowAction(action, { id, name, uri }) {
+    onTableRowAction(action, { uri }) {
       if (action === 'delete') {
         this.$bvModal
           .msgBoxConfirm(this.$tc('pageEventLogs.modal.deleteMessage'), {
@@ -593,27 +593,15 @@ export default {
         //  download single log
         const pelJsonInfo = [];
         this.startLoader();
-        if (name === 'System CE Log Entry') {
-          this.$store
-            .dispatch('eventLog/downloadCELogData', id)
-            .then((returned) => {
-              pelJsonInfo.push(returned);
-            })
-            .finally(() => {
-              this.downloadFile(pelJsonInfo);
-              this.endLoader();
-            });
-        } else {
-          this.$store
-            .dispatch('eventLog/downloadEventLogData', id)
-            .then((returned) => {
-              pelJsonInfo.push(returned);
-            })
-            .finally(() => {
-              this.downloadFile(pelJsonInfo);
-              this.endLoader();
-            });
-        }
+        this.$store
+          .dispatch('eventLog/downloadLogData', uri)
+          .then((returned) => {
+            pelJsonInfo.push(returned);
+          })
+          .finally(() => {
+            this.downloadFile(pelJsonInfo);
+            this.endLoader();
+          });
       }
     },
     onBatchAction(action) {
@@ -697,78 +685,39 @@ export default {
         let counter = 1;
         while (counter <= this.allLogs.length) {
           this.startLoader();
-          if (this.allLogs[counter - 1].name === 'System CE Log Entry') {
-            await this.$store
-              .dispatch(
-                'eventLog/downloadCELogData',
-                this.allLogs[counter - 1].id
-              )
-              .then((returned) => {
-                pelJsonInfo.push(returned);
-                counter = counter + 1;
-              })
-              .finally(() => {
-                if (pelJsonInfo.length === this.allLogs.length) {
-                  this.downloadFile(pelJsonInfo);
-                  this.endLoader();
-                }
-              });
-          } else {
-            await this.$store
-              .dispatch(
-                'eventLog/downloadEventLogData',
-                this.allLogs[counter - 1].id
-              )
-              .then((returned) => {
-                pelJsonInfo.push(returned);
-                counter = counter + 1;
-              })
-              .finally(() => {
-                if (pelJsonInfo.length === this.allLogs.length) {
-                  this.downloadFile(pelJsonInfo);
-                  this.endLoader();
-                }
-              });
-          }
+          await this.$store
+            .dispatch('eventLog/downloadLogData', this.allLogs[counter - 1].uri)
+            .then((returned) => {
+              pelJsonInfo.push(returned);
+              counter = counter + 1;
+            })
+            .finally(() => {
+              if (pelJsonInfo.length === this.allLogs.length) {
+                this.downloadFile(pelJsonInfo);
+                this.endLoader();
+              }
+            });
         }
       } else {
         // several logs
         let counter = 1;
         while (counter <= this.selectedRows.length) {
           this.startLoader();
-          if (this.selectedRows[counter - 1].name === 'System CE Log Entry') {
-            await this.$store
-              .dispatch(
-                'eventLog/downloadCELogData',
-                this.selectedRows[counter - 1].id
-              )
-              .then((returned) => {
-                pelJsonInfo.push(returned);
-                counter = counter + 1;
-              })
-              .finally(() => {
-                if (pelJsonInfo.length === this.selectedRows.length) {
-                  this.downloadFile(pelJsonInfo);
-                  this.endLoader();
-                }
-              });
-          } else {
-            await this.$store
-              .dispatch(
-                'eventLog/downloadEventLogData',
-                this.selectedRows[counter - 1].id
-              )
-              .then((returned) => {
-                pelJsonInfo.push(returned);
-                counter = counter + 1;
-              })
-              .finally(() => {
-                if (pelJsonInfo.length === this.selectedRows.length) {
-                  this.downloadFile(pelJsonInfo);
-                  this.endLoader();
-                }
-              });
-          }
+          await this.$store
+            .dispatch(
+              'eventLog/downloadLogData',
+              this.selectedRows[counter - 1].uri
+            )
+            .then((returned) => {
+              pelJsonInfo.push(returned);
+              counter = counter + 1;
+            })
+            .finally(() => {
+              if (pelJsonInfo.length === this.selectedRows.length) {
+                this.downloadFile(pelJsonInfo);
+                this.endLoader();
+              }
+            });
         }
       }
     },