Merge branch 'main' into ws-fix

konflux-ci · Jan 15, 2025 · e43c014 · e43c014
2 parents f58ee37 + 7f329d6
commit e43c014
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/shared/components/pipeline-run-logs/logs/logs-utils.ts b/src/shared/components/pipeline-run-logs/logs/logs-utils.ts
@@ -154,8 +154,8 @@ export const getDownloadAllLogsCallback = (
         allLogs += await getTaskRunLog(
           workspace,
           namespace,
-          pipelineRunUID,
           taskRun?.metadata?.uid,
+          pipelineRunUID,
         ).then((log) => `${tasks[currTask].name.toUpperCase()}\n\n${log}\n\n`);
       }
     }

diff --git a/src/utils/__tests__/tekton-results.spec.ts b/src/utils/__tests__/tekton-results.spec.ts
@@ -580,7 +580,7 @@ describe('tekton-results', () => {
     it('should return the latest component build task run', async () => {
       commonFetchJSONMock.mockReturnValueOnce(mockLogsRecordsList);
       commonFetchTextMock.mockReturnValueOnce(Promise.resolve(mockLogResponse));
-      expect(await getTaskRunLog('test-ws', 'test-ns', 'pipelinerun-uid', 'test-id')).toEqual(
+      expect(await getTaskRunLog('test-ws', 'test-ns', 'test-id', 'pipelinerun-uid')).toEqual(
         'sample log',
       );
       expect(commonFetchTextMock.mock.calls).toEqual([

diff --git a/src/utils/tekton-results.ts b/src/utils/tekton-results.ts
@@ -346,8 +346,8 @@ export const getTaskRuns = (
 export const getTaskRunLog = (
   workspace: string,
   namespace: string,
-  pid: string,
   taskRunID: string,
+  pid: string,
 ): Promise<string> =>
   commonFetchText(
     `${getTRUrlPrefix(workspace)}/${namespace}/results/${pid}/logs/${taskRunID}`,