feat: taskrun list by ResultsAPI add link to taskrun

tektoncd · Dec 24, 2024 · b3c2bea · b3c2bea
1 parent 35de10d
commit b3c2bea
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 20 deletions.
diff --git a/packages/components/src/components/TaskRuns/TaskRuns.jsx b/packages/components/src/components/TaskRuns/TaskRuns.jsx
@@ -138,7 +138,8 @@ const TaskRuns = ({
     const statusIcon = getTaskRunStatusIcon(taskRun);
     const taskRunURL = getTaskRunURL({
       name: taskRunName,
-      namespace
+      namespace,
+      taskRun
     });
 
     const taskRunsURL =

diff --git a/src/api/taskRunsByResultsAPI.js b/src/api/taskRunsByResultsAPI.js
@@ -28,7 +28,6 @@ export function useTaskRunsByResultsAPI(namespace, queryConfig) {
         result: '-',
         filters: 'data_type==TASK_RUN'
       });
-      console.debug("Querying TaskRuns by ResultsAPI, uri:", uri);
       const resp = await fetch(uri, {
         method: 'GET',
         headers: {
@@ -52,12 +51,6 @@ export function useTaskRunsByResultsAPI(namespace, queryConfig) {
     staleTime: 0,
     ...queryConfig
   });
-  if (query.data) {
-    console.debug(
-      'records queried for TaskRuns, response: ',
-      JSON.parse(JSON.stringify(query.data))
-    );
-  }
   return {
     ...query,
     data: query.data?.records || []
@@ -82,7 +75,6 @@ export function useTaskRunByResultsAPI(
         resultUID,
         recordUID
       });
-      console.debug('Querying TaskRun by ResultsAPI, uri:', uri);
       const resp = await fetch(uri, {
         method: 'GET',
         headers: {
@@ -104,11 +96,5 @@ export function useTaskRunByResultsAPI(
     },
     ...queryConfig
   });
-  if (query.data) {
-    console.debug(
-      'TaskRun queried by ResultsAPI, record:',
-      JSON.parse(JSON.stringify(query.data))
-    );
-  }
   return query;
 }
diff --git a/src/api/taskRunsByResultsAPI.test.js b/src/api/taskRunsByResultsAPI.test.js
@@ -12,6 +12,7 @@ limitations under the License.
 */
 import * as API from './taskRunsByResultsAPI';
 
+// TODO(xinnjie): add tests. Un-runnable test to block PR merge.
 it('useTaskRunsByResults', () => {
   expect(API.useTaskRunsByResultsAPI()).toEqual(null);
 });
diff --git a/src/containers/TaskRunByResults/TaskRunByResults.jsx b/src/containers/TaskRunByResults/TaskRunByResults.jsx
@@ -64,8 +64,7 @@ export function TaskRunContainerByResults() {
 
   const maximizedLogsContainer = useRef();
   const [isLogsMaximized, setIsLogsMaximized] = useState(false);
-  const [showNotification, setShowNotification] = useState(null);
-  const [isUsingExternalLogs, setIsUsingExternalLogs] = useState(false);
+  const isUsingExternalLogs = false;
 
   const {
     data: record,
@@ -123,7 +122,7 @@ export function TaskRunContainerByResults() {
       return null;
     }
 
-    // TODO(xinnjie) supporting Step level log,log provided by ResultsAPI is currently TaskRun level instead of Step level
+    // TODO(xinnjie): supporting Step level log, log provided by ResultsAPI is currently TaskRun level instead of Step level
     const log = getLogByResultsAPI({
       namespace,
       resultUID,
@@ -139,6 +138,7 @@ export function TaskRunContainerByResults() {
           : null)}
       >
         <Log
+          // FIXME(xinnjie): log in toolbar is not from ResultsAPI yet
           toolbar={getLogsToolbar({
             isMaximized: isLogsMaximized,
             isUsingExternalLogs,

diff --git a/src/containers/TaskRunsByResults/TaskRunsByResults.jsx b/src/containers/TaskRunsByResults/TaskRunsByResults.jsx
@@ -18,7 +18,20 @@ import { useSelectedNamespace } from '../../api';
 import { useTaskRunsByResultsAPI } from '../../api/taskRunsByResultsAPI';
 import ListPageLayout from '../ListPageLayout';
 
+const recordAnnotationKey = 'results.tekton.dev/record';
 function TaskRunsByResults() {
+  function getTaskRunURL({ namespace, taskRun }) {
+    // TODO(xinnjie): best user experience will be like if taskRun is still exist in kubernetes, provide a link to the taskRun page with live info and logs.
+    // if not, provide a link to the taskRun page by ResultsAPI
+    const recordAnnotation = taskRun.metadata.annotations[recordAnnotationKey];
+    // record annotation format: default/results/8b19a00c-d702-4903-a9eb-d41d37250240/records/8b19a00c-d702-4903-a9eb-d41d37250240
+    const [, , resultuid, , recorduid] = recordAnnotation.split('/');
+    return urls.taskRunsByResults.byUID({
+      namespace,
+      resultuid,
+      recorduid
+    });
+  }
   const params = useParams();
   const { namespace: namespaceParam } = params;
   const { selectedNamespace } = useSelectedNamespace();
@@ -31,11 +44,11 @@ function TaskRunsByResults() {
   } = useTaskRunsByResultsAPI(namespace, {
     staleTime: 1000 // 1 second
   });
+
   if (isLoading) {
     return <div>Loading...</div>;
   }
   if (error) {
-    console.error('Error querying TaskRuns by ResultsAPI', error);
     return (
       <NotFound
         suggestions={[
@@ -48,7 +61,6 @@ function TaskRunsByResults() {
     );
   }
   const taskRuns = recordsForTaskRuns.map(record => record.data.value);
-  console.debug('taskRuns', JSON.parse(JSON.stringify(taskRuns)));
 
   return (
     <ListPageLayout
@@ -62,6 +74,7 @@ function TaskRunsByResults() {
           loading={isLoading}
           selectedNamespace={namespace}
           taskRuns={resources}
+          getTaskRunURL={getTaskRunURL}
         />
       )}
     </ListPageLayout>