EPMRPP-80211 || fix open error log: failed NS inside passed NS (#3304)

reportportal · Oct 19, 2022 · 9618e91 · 9618e91
1 parent 4fb5591
commit 9618e91
Showing 1 changed file with 10 additions and 15 deletions.
diff --git a/app/src/controllers/log/sagas.js b/app/src/controllers/log/sagas.js
@@ -257,23 +257,18 @@ function* fetchErrorLog({ payload: { errorLogInfo, callback } }) {
     for (let i = 0; i < formattedPageLocation.length; i += 1) {
       const [id, page] = formattedPageLocation[i];
       const { initial, content } = yield select(nestedStepSelector, id);
+      const nextLocation = formattedPageLocation[i + 1];
+      const wantedId = nextLocation ? nextLocation[0] : errorLogId;
+      const isLogLoaded = content.find((log) => +log.id === +wantedId);
 
-      if (initial) {
+      if (initial || !isLogLoaded) {
         yield loadStep({ id, errorLogPage: page });
-      } else {
-        // check is next step exist in the current one
-        const nextLocation = formattedPageLocation[i + 1];
-        const wantedId = nextLocation ? nextLocation[0] : errorLogId;
-        const isLogLoaded = content.find((log) => +log.id === +wantedId);
-        if (!isLogLoaded) {
-          yield loadStep({ id, errorLogPage: page });
-        }
-        // check step is failed and open
-        const { collapsed, content: stepContent } = yield select(nestedStepSelector, id);
-        const step = stepContent.find((log) => +log.id === +wantedId && log.status === FAILED);
-        if (step && collapsed) {
-          skipIds.push(+step.id);
-        }
+      }
+      // add next id to skipIds arr if next step has failed status
+      const { collapsed, content: stepContent } = yield select(nestedStepSelector, id);
+      const step = stepContent.find((log) => +log.id === +wantedId && log.status === FAILED);
+      if (step && collapsed) {
+        skipIds.push(+wantedId);
       }
     }
   }