Migrate Pipeline Runs

package.json

@@ -77,7 +77,6 @@
     "miragejs": "^0.1.48",
     "mock-socket": "^9.3.1",
     "prettier": "^3.1.1",
-    "redux-saga-test-plan": "^4.0.6",
     "swagger-proptypes": "^7.0.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.3.3",

proxy/server.dev.conf

@@ -10,7 +10,7 @@ server {
 
     location /api/ {
         proxy_pass https://server-radix-api-qa.dev.radix.equinor.com;
-        # proxy_pass https://localhost:3002;
+        # proxy_pass http://172.20.0.1:3002;
         proxy_set_header Authorization "Bearer $http_x_forwarded_access_token";
         proxy_set_header x-forwarded-access-token "";
     }

src/api/api-helpers.ts

@@ -1,10 +1,4 @@
 import { merge } from 'lodash';
-import { Observable, of } from 'rxjs';
-import { ajax, AjaxResponse } from 'rxjs/ajax';
-import { map, catchError } from 'rxjs/operators';
-
-import { AsyncState } from '../effects/effect-types';
-import { RequestState } from '../state/state-utils/request-states';
 import { NetworkException } from '../utils/exception';
 
 export type RadixRequestInit = Omit<RequestInit, 'body' | 'method'>;
@@ -96,43 +90,8 @@ export async function getText(
   return fetchPlain(url, { ...options, method: 'GET' });
 }
 
-/**
- * DELETE remote resource
- * @param {string} url Full URL
- */
-export async function deleteRequest(
-  url: string,
-  options?: RadixRequestInit
-): Promise<string> {
-  return fetchPlain(url, { ...options, method: 'DELETE' });
-}
-
-/**
- * POST action
- * @param {string} url Full URL
- */
-export async function postRequest(
-  url: string,
-  options?: RadixRequestInit
-): Promise<string> {
-  return fetchPlain(url, { ...options, method: 'POST' });
-}
-
 // --- JSON requests -----------------------------------------------------------
 
-/**
- * @callback JsonFetcher
- * @param {string} url The URL to the resource
- * @returns {Promise}
- */
-
-/**
- * @callback JsonFetcherWithBody
- * @param {string} url The URL to the resource
- * @param {*} data Data to send to server
- * @returns {Promise}
- */
-
 /**
  * Fetch (and optionally, send) JSON
  * @param {string} url Full URL to fetch
@@ -226,51 +185,3 @@ export const putJson: <T>(
   options: RadixRequestInit | undefined,
   data: unknown
 ) => Promise<T> = makeJsonRequester('PUT');
-
-/**
- * PATCH JSON to remote resource
- * @function
- * @type {JsonFetcherWithBody}
- */
-export const patchJson: <T>(
-  url: string,
-  options: RadixRequestInit | undefined,
-  data: unknown
-) => Promise<T> = makeJsonRequester('PATCH');
-
-// --- AJAX JSON requests ------------------------------------------------------
-
-function ajaxRequest<T>(
-  request$: Observable<AjaxResponse<T>>
-): Observable<AsyncState<T>> {
-  return request$.pipe(
-    map(({ response }) => ({
-      status: RequestState.SUCCESS,
-      data: response,
-    })),
-    catchError((err) =>
-      of({
-        status: RequestState.FAILURE,
-        data: null as T,
-        error: err.message,
-      })
-    )
-  );
-}
-
-export function ajaxGet<T>(
-  url: string,
-  contentType = 'application/json'
-): Observable<AsyncState<T>> {
-  const headers: Record<string, string> = { 'Content-Type': contentType };
-  return ajaxRequest(ajax.get<T>(url, headers));
-}
-
-export function ajaxPost<T>(
-  url: string,
-  body: unknown,
-  contentType = 'application/json'
-): Observable<AsyncState<T>> {
-  const headers: Record<string, string> = { 'Content-Type': contentType };
-  return ajaxRequest(ajax.post<T>(url, body, headers));
-}

src/api/jobs.ts

@@ -2,9 +2,9 @@ import { createRadixApiUrl } from './api-config';
 import { deleteJson, postJson } from './api-helpers';
 
 import { RawModel } from '../models/model-types';
-import { JobSummaryModel } from '../models/radix-api/jobs/job-summary';
 import { ScheduledJobRequestModel } from '../models/radix-api/environments/scheduled-job-request';
 import { ScheduledBatchRequestModel } from '../models/radix-api/environments/scheduled-batch-request';
+import { JobSummary } from '../store/radix-api';
 
 export type PipelineNames = 'build' | 'build-deploy' | 'deploy' | 'promote';
 
@@ -53,11 +53,11 @@ export async function createJob<T extends PipelineNames>({
     ? PipelineParametersDeploy
     : [T] extends ['promote']
       ? PipelineParametersPromote
-      : {})): Promise<RawModel<JobSummaryModel>> {
+      : {})): Promise<RawModel<JobSummary>> {
   const encAppName = encodeURIComponent(appName);
   const encPipelineName = encodeURIComponent(pipelineName);
 
-  return await postJson<RawModel<JobSummaryModel>>(
+  return await postJson<RawModel<JobSummary>>(
     createRadixApiUrl(
       `${apiPaths.apps}/${encAppName}/pipelines/${encPipelineName}`
     ),

src/api/resources.ts

@@ -60,42 +60,17 @@ function generateApiResource<
       };
 }
 
-/* eslint-disable prettier/prettier */
 // NB: The keys here must match the Redux action prefixes for the resources in
 // the /state/{resource}/action-types.js files
 export const apiResources = {
-  APP: generateApiResource<[appName: string]>(
-    '/applications/:appName'
-  ),
+  APP: generateApiResource<[appName: string]>('/applications/:appName'),
   DEPLOYMENTS: generateApiResource<[appName: string]>(
     '/applications/:appName/deployments'
   ),
-  APPLICATION_ALERTING: generateApiResource<[appName: string]>(
-    '/applications/:appName/alerting'
-  ),
-  ENVIRONMENT_ALERTING: generateApiResource<[appName: string, envName: string]>(
-    '/applications/:appName/environments/:envName/alerting'
-  ),
   JOB: generateApiResource<[appName: string, jobName: string]>(
     '/applications/:appName/jobs/:jobName'
   ),
-  PIPELINE_RUN_TASK_STEPS: generateApiResource<[appName: string, jobName: string, pipelineRunName: string, taskName: string]>(
-    '/applications/:appName/jobs/:jobName/pipelineruns/:pipelineRunName/tasks/:taskName/steps'
-  ),
-  PIPELINE_RUN_TASK: generateApiResource<[appName: string, jobName: string, pipelineRunName: string, taskName: string]>(
-    '/applications/:appName/jobs/:jobName/pipelineruns/:pipelineRunName/tasks/:taskName'
-  ),
-  PIPELINE_RUN_TASKS: generateApiResource<[appName: string, jobName: string, pipelineRunName: string]>(
-    '/applications/:appName/jobs/:jobName/pipelineruns/:pipelineRunName/tasks'
-  ),
-  PIPELINE_RUN: generateApiResource<[appName: string, jobName: string, pipelineRunName: string]>(
-    '/applications/:appName/jobs/:jobName/pipelineruns/:pipelineRunName'
-  ),
-  PIPELINE_RUNS: generateApiResource<[appName: string, jobName: string]>(
-    '/applications/:appName/jobs/:jobName/pipelineruns'
-  ),
 };
-/* eslint-enable prettier/prettier */
 
 export async function subscribe<
   P extends ApiMessageType,

src/components/app-list-item/dev.tsx

@@ -2,8 +2,6 @@ import { Typography } from '@equinor/eds-core-react';
 
 import { AppListItem, AppListItemProps, FavouriteClickedHandler } from '.';
 
-import { RadixJobCondition } from '../../models/radix-api/jobs/radix-job-condition';
-
 const noop: FavouriteClickedHandler = (evt) => evt.preventDefault();
 
 const testData: Array<{ description: string } & AppListItemProps> = [
@@ -20,7 +18,7 @@ const testData: Array<{ description: string } & AppListItemProps> = [
         name: 'test-job',
         created: new Date().toISOString(),
         started: new Date().toISOString(),
-        status: RadixJobCondition.Running,
+        status: 'Running',
         pipeline: 'build-deploy',
       },
     },