Change API endpoints to match new murfey version

src/index.tsx

@@ -21,7 +21,6 @@ import { ProcessingParameters } from "routes/ProcessingParameters";
 import { SessionParameters } from "routes/SessionParameters";
 import { Error } from "routes/Error";
 import {
-  clientsLoader,
   sessionsLoader,
   sessionLoader,
 } from "loaders/session_clients";
@@ -89,12 +88,6 @@ const router = createBrowserRouter([
         errorElement: <Error />,
         loader: machineConfigLoader(queryClient),
       },
-      {
-        path: "/link_session",
-        element: <SessionLinker />,
-        errorElement: <Error />,
-        loader: clientsLoader(queryClient),
-      },
       {
         path: "/sessions/:sessid/gain_ref_transfer",
         element: <GainRefTransfer />,
@@ -152,6 +145,3 @@ root.render(
     </QueryClientProvider>
   </ChakraProvider>,
 );
-
-
-// loader: ({ params }) => gridSquaresLoader(queryClient)(params),

src/loaders/dataCollectionGroups.tsx

@@ -5,7 +5,7 @@ import { Params } from "react-router-dom";
 const getDataCollectionGroups = async (sessid: string = "0") => {
   console.log("data collection groups gather");
   const response = await client.get(
-    `sessions/${sessid}/data_collection_groups`,
+    `session_info/sessions/${sessid}/data_collection_groups`,
   );
 
   if (response.status !== 200) {

src/loaders/general.tsx

@@ -1,7 +1,7 @@
 import { client } from "utils/api/client";
 
 export const getInstrumentName = async () => {
-  const response = await client.get(`instruments/${sessionStorage.getItem("instrumentName")}/instrument_name`);
+  const response = await client.get(`display/instruments/${sessionStorage.getItem("instrumentName")}/instrument_name`);
 
   if (response.status !== 200) {
     return null;
@@ -10,7 +10,7 @@ export const getInstrumentName = async () => {
 };
 
 export const getInstrumentConnectionStatus = async () => {
-  const response = await client.get(`instruments/${sessionStorage.getItem("instrumentName")}/instrument_server`, {}, false);
+  const response = await client.get(`instrument_server/instruments/${sessionStorage.getItem("instrumentName")}/instrument_server`, {}, false);
 
   if (response.status !== 200) {
     return false;
@@ -20,7 +20,7 @@ export const getInstrumentConnectionStatus = async () => {
 };
 
 export const getUpstreamVisits = async (sessid: number) => {
-  const response = await client.get(`sessions/${sessid}/upstream_visits`);
+  const response = await client.get(`session_info/correlative/sessions/${sessid}/upstream_visits`);
 
   if (response.status !== 200) {
     return null;
@@ -29,7 +29,7 @@ export const getUpstreamVisits = async (sessid: number) => {
 };
 
 export const upstreamDataDownloadRequest = async (visitName: string, sessid: number) => {
-  const response = await client.get(`visits/${visitName}/${sessid}/upstream_tiff_data_request`);
+  const response = await client.get(`session_info/correlative/visits/${visitName}/${sessid}/upstream_tiff_data_request`);
 
   if (response.status !== 200) {
     return null;

src/loaders/gridSquares.tsx

@@ -5,7 +5,7 @@ import { Params } from "react-router-dom";
 const getGridSquares = async (sessid: string = "0", dataCollectionGroupId: string = "0") => {
   console.log("getting grid squares");
   const response = await client.get(
-    `sessions/${sessid}/data_collection_groups/${dataCollectionGroupId}/grid_squares`,
+    `session_info/spa/sessions/${sessid}/data_collection_groups/${dataCollectionGroupId}/grid_squares`,
   );
 
   if (response.status !== 200) {
@@ -17,7 +17,7 @@ const getGridSquares = async (sessid: string = "0", dataCollectionGroupId: strin
 
 const getNumMovies = async (sessid: string, dataCollectionGroupId: string, gridSquareId: number) => {
   const response = await client.get(
-    `sessions/${sessid}/data_collection_groups/${dataCollectionGroupId}/grid_squares/${gridSquareId}/num_movies`,
+    `session_info/spa/sessions/${sessid}/data_collection_groups/${dataCollectionGroupId}/grid_squares/${gridSquareId}/num_movies`,
   );
 
   if (response.status !== 200) {
@@ -30,7 +30,7 @@ const getNumMovies = async (sessid: string, dataCollectionGroupId: string, gridS
 
 const getFoilHoles = async (sessid: string, dataCollectionGroupId: string, gridSquareId: number) => {
   const response = await client.get(
-    `sessions/${sessid}/data_collection_groups/${dataCollectionGroupId}/grid_squares/${gridSquareId}/foil_holes`,
+    `session_info/spa/sessions/${sessid}/data_collection_groups/${dataCollectionGroupId}/grid_squares/${gridSquareId}/foil_holes`,
   );
 
   if (response.status !== 200) {

src/loaders/jwt.tsx

@@ -19,7 +19,7 @@ export const getJWT = async (loginDetails: LoginDetails) => {
 };
 
 export const handshake = async () => {
-  const response = await client.post(`instruments/${sessionStorage.getItem("instrumentName")}/activate_instrument_server`, {});
+  const response = await client.post(`instrument_server/instruments/${sessionStorage.getItem("instrumentName")}/activate_instrument_server`, {});
   if (response.status !== 200) {
     return null;
   }
@@ -28,11 +28,11 @@ export const handshake = async () => {
 }
 
 export const sessionHandshake = async (sessid: number) => {
-  const response = await client.post(`instruments/${sessionStorage.getItem("instrumentName")}/sessions/${sessid}/activate_instrument_server`, {});
+  const response = await client.post(`instrument_server/instruments/${sessionStorage.getItem("instrumentName")}/sessions/${sessid}/activate_instrument_server`, {});
   return response.data;
 }
 
 export const sessionTokenCheck = async (sessid: number) => {
-  const response = await client.get(`instruments/${sessionStorage.getItem("instrumentName")}/sessions/${sessid}/active`);
+  const response = await client.get(`instrument_server/instruments/${sessionStorage.getItem("instrumentName")}/sessions/${sessid}/active`);
   return response.data.active;
 }

src/loaders/machineConfig.tsx

@@ -5,7 +5,7 @@ import { Params } from "react-router-dom";
 import { parseDate } from "utils/generic";
 
 export const getMachineConfigData = async () => {
-  const response = await client.get(`instruments/${sessionStorage.getItem("instrumentName")}/machine`);
+  const response = await client.get(`session_info/instruments/${sessionStorage.getItem("instrumentName")}/machine`);
 
   if (response.status !== 200) {
     return null;

src/loaders/magTable.tsx

@@ -15,7 +15,7 @@ export const addMagTableRow = async (
   magnification: number,
   pixelSize: number,
 ) => {
-  const response = await client.post(`mag_table/`, [{
+  const response = await client.post(`mag_table/mag_table/`, [{
     magnification: magnification,
     pixel_size: pixelSize,
   }]);
@@ -28,7 +28,7 @@ export const addMagTableRow = async (
 export const removeMagTableRow = async (
   magnification: number,
 ) => {
-  const response = await client.delete(`mag_table/${magnification}`);
+  const response = await client.delete(`mag_table/mag_table/${magnification}`);
   if (response.status !== 200) {
     return null;
   }

src/loaders/multigridSetup.tsx

@@ -9,7 +9,7 @@ export const setupMultigridWatcher = async (
   sessionId: number,
 ) => {
   const response = await client.post(
-    `sessions/${sessionId}/multigrid_watcher`,
+    `instrument_server/sessions/${sessionId}/multigrid_watcher`,
     multigridWatcher,
   );
 
@@ -24,7 +24,7 @@ export const startMultigridWatcher = async (
   sessionId: number,
 ) => {
   const response = await client.post(
-    `sessions/${sessionId}/start_multigrid_watcher`,
+    `instrument_server/sessions/${sessionId}/start_multigrid_watcher`,
     {},
   );
 

src/loaders/possibleGainRefs.tsx

@@ -3,7 +3,7 @@ import { client } from "utils/api/client";
 import { Params } from "react-router-dom";
 
 const getGainRefData = async (sessionId: string) => {
-  const response = await client.get(`instruments/${sessionStorage.getItem("instrumentName")}/sessions/${sessionId}/possible_gain_references`);
+  const response = await client.get(`instrument_server/instruments/${sessionStorage.getItem("instrumentName")}/sessions/${sessionId}/possible_gain_references`);
 
   if (response.status !== 200) {
     return null;
@@ -16,7 +16,7 @@ export const transferGainReference = async (
   sessionId: number,
   gainRef: string,
 ) => {
-  const response = await client.post(`sessions/${sessionId}/upload_gain_reference`, {
+  const response = await client.post(`instrument_server/sessions/${sessionId}/upload_gain_reference`, {
     gain_path: gainRef,
   });
   if (response.status !== 200) {
@@ -32,7 +32,7 @@ export const prepareGainReference = async (
   eer: boolean = false,
   tag: string = "",
 ) => {
-  const response = await client.post(`sessions/${sessionId}/process_gain`, {
+  const response = await client.post(`file_manipulation/sessions/${sessionId}/process_gain`, {
     gain_ref: gainRef,
     rescale: rescale,
     eer: eer,
@@ -48,7 +48,7 @@ export const updateCurrentGainReference = async (
   sessionId: number,
   gainRef: string,
 ) => {
-  const response = await client.put(`sessions/${sessionId}/current_gain_ref`, {
+  const response = await client.put(`session_info/sessions/${sessionId}/current_gain_ref`, {
     path: gainRef,
   });
   if (response.status !== 200) {

src/loaders/processingParameters.tsx

@@ -4,7 +4,7 @@ import { Params } from "react-router-dom";
 
 export const getSessionProcessingParameterData = async (sessid: string = "0") => {
   const response = await client.get(
-    `sessions/${sessid}/session_processing_parameters`,
+    `session_parameters/sessions/${sessid}/session_processing_parameters`,
   );
 
   if (response.status !== 200) {
@@ -16,7 +16,7 @@ export const getSessionProcessingParameterData = async (sessid: string = "0") =>
 
 const getProcessingParameterData = async (sessid: string = "0") => {
   const response = await client.get(
-    `sessions/${sessid}/spa_processing_parameters`,
+    `session_info/spa/sessions/${sessid}/spa_processing_parameters`,
   );
 
   if (response.status !== 200) {
@@ -27,7 +27,7 @@ const getProcessingParameterData = async (sessid: string = "0") => {
 };
 
 export const updateSessionProcessingParameters = async (sessid: string, params: any = {}) => {
-  const response = await client.post(`sessions/${sessid}/session_processing_parameters`, {
+  const response = await client.post(`session_parameters/sessions/${sessid}/session_processing_parameters`, {
     gain_ref: params["gainRef"] ?? "",
     dose_per_frame: params["dosePerFrame"] ?? null,
     eer_fractionation_file: params["eerFractionationFile"] ?? "",

src/loaders/rsyncers.tsx

@@ -5,7 +5,7 @@ import { Params } from "react-router-dom";
 import { parseDate } from "utils/generic";
 
 const getRsyncerData = async (sessionId: string) => {
-  const response = await client.get(`instruments/${sessionStorage.getItem("instrumentName")}/sessions/${sessionId}/rsyncer_info`);
+  const response = await client.get(`instrument_server/instruments/${sessionStorage.getItem("instrumentName")}/sessions/${sessionId}/rsyncer_info`);
 
   if (response.status !== 200) {
     return null;
@@ -17,7 +17,7 @@ const getRsyncerData = async (sessionId: string) => {
 export const pauseRsyncer = async (sessionId: number, source: string) => {
   console.log("stopping rsyncer");
 
-  const response = await client.post(`sessions/${sessionId}/stop_rsyncer`, {
+  const response = await client.post(`instrument_server/sessions/${sessionId}/stop_rsyncer`, {
     source: source,
   });
 
@@ -33,7 +33,7 @@ export const pauseRsyncer = async (sessionId: number, source: string) => {
 export const restartRsyncer = async (sessionId: number, source: string) => {
   console.log("stopping rsyncer");
 
-  const response = await client.post(`sessions/${sessionId}/restart_rsyncer`, {
+  const response = await client.post(`instrument_server/sessions/${sessionId}/restart_rsyncer`, {
     source: source,
   });
 
@@ -48,7 +48,7 @@ export const restartRsyncer = async (sessionId: number, source: string) => {
 
 export const finaliseRsyncer = async (sessionId: number, source: string) => {
 
-  const response = await client.post(`sessions/${sessionId}/finalise_rsyncer`, {
+  const response = await client.post(`instrument_server/sessions/${sessionId}/finalise_rsyncer`, {
     source: source,
   });
 
@@ -63,7 +63,7 @@ export const finaliseRsyncer = async (sessionId: number, source: string) => {
 
 export const finaliseSession = async (sessionId: number) => {
 
-  const response = await client.post(`sessions/${sessionId}/finalise_session`, {});
+  const response = await client.post(`instrument_server/sessions/${sessionId}/finalise_session`, {});
 
   if (response.status !== 200) {
     return null;
@@ -77,7 +77,7 @@ export const finaliseSession = async (sessionId: number) => {
 export const removeRsyncer = async (sessionId: number, source: string) => {
   console.log("removing rsyncer");
 
-  const response = await client.post(`sessions/${sessionId}/remove_rsyncer`, {
+  const response = await client.post(`instrument_server/sessions/${sessionId}/remove_rsyncer`, {
     source: source,
   });
 

src/loaders/sessionSetup.tsx

@@ -9,7 +9,7 @@ export const registerProcessingParameters = async (
   sessionId: number,
 ) => {
   const response = await client.post(
-    `sessions/${sessionId}/provided_processing_parameters`,
+    `instrument_server/sessions/${sessionId}/provided_processing_parameters`,
     processingParameters,
   );
 

src/loaders/session_clients.tsx

@@ -7,7 +7,7 @@ export const includePage = (endpoint: string, limit: number, page: number) =>
   `${endpoint}${endpoint.includes("?") ? "&" : "?"}page=${page - 1}&limit=${limit}`;
 
 const getSessionsData = async () => {
-  const response = await client.get(`sessions`);
+  const response = await client.get(`session_info/instruments/${sessionStorage.getItem("instrumentName")}/sessions`);
 
   if (response.status !== 200) {
     return null;
@@ -20,26 +20,16 @@ const getSessionsData = async () => {
 
 export const getSessionDataForVisit = async (visit: string, instrumentName: string) => {
   if(visit === "" || instrumentName === "") return [];
-  const response = await client.get(`instruments/${instrumentName}/visits/${visit}/sessions`);
+  const response = await client.get(`session_info/instruments/${instrumentName}/visits/${visit}/sessions`);
   if (response.status !== 200) {
     return [];
   }
 
   return response.data;
 }
 
-const getClientData = async () => {
-  const response = await client.get(`clients`);
-
-  if (response.status !== 200) {
-    return null;
-  }
-
-  return response.data;
-};
-
 const getSessionData = async (sessid: string = "0") => {
-  const response = await client.get(`session/${sessid}`);
+  const response = await client.get(`session_info/session/${sessid}`);
 
   if (response.status !== 200) {
     return null;
@@ -52,7 +42,7 @@ export const linkSessionToClient = async (
   client_id: number,
   sessionName: string,
 ) => {
-  const response = await client.post(`clients/${client_id}/session`, {
+  const response = await client.post(`session_info/clients/${client_id}/session`, {
     session_name: sessionName,
   });
   if (response.status !== 200) {
@@ -63,7 +53,7 @@ export const linkSessionToClient = async (
 
 export const createSession = async (visit: string, sessionName: string, instrumentName: string) => {
   const response = await client.post(
-    `instruments/${instrumentName}/visits/${visit}/session/${sessionName}`,
+    `session_info/instruments/${instrumentName}/visits/${visit}/session/${sessionName}`,
     {},
   );
   if (response.status !== 200) {
@@ -74,7 +64,7 @@ export const createSession = async (visit: string, sessionName: string, instrume
 
 export const updateSession = async (sessionID: number, process: boolean = true) => {
   const response = await client.post(
-    `sessions/${sessionID}?process=${process ? 'true': 'false'}`,
+    `session_info/sessions/${sessionID}?process=${process ? 'true': 'false'}`,
     {},
   );
   if (response.status !== 200) {
@@ -84,7 +74,7 @@ export const updateSession = async (sessionID: number, process: boolean = true)
 }
 
 export const deleteSessionData = async (sessid: number) => {
-  const response = await client.delete(`sessions/${sessid}`);
+  const response = await client.delete(`session_info/sessions/${sessid}`);
   if (response.status !== 200) {
     return null;
   }
@@ -97,19 +87,10 @@ const query = {
   staleTime: 60000,
 };
 
-const clientQuery = {
-  queryKey: ["homepageClients", sessionStorage.getItem("instrumentName")],
-  queryFn: getClientData,
-  staleTime: 60000,
-};
-
 export const sessionsLoader = (queryClient: QueryClient) => async () =>
   (await queryClient.getQueryData(query.queryKey)) ??
   (await queryClient.fetchQuery(query));
 
-export const clientsLoader = (queryClient: QueryClient) => async () =>
-  (await queryClient.getQueryData(clientQuery.queryKey)) ??
-  (await queryClient.fetchQuery(clientQuery));
 
 const queryBuilder = (sessid: string = "0") => {
   return {

src/loaders/visits.tsx

@@ -3,7 +3,7 @@ import { client } from "utils/api/client";
 import { Params } from "react-router-dom";
 
 const getVisitData = async (instrumentName: string) => {
-  const response = await client.get(`instruments/${instrumentName}/visits_raw`);
+  const response = await client.get(`session_info/instruments/${instrumentName}/visits_raw`);
 
   if (response.status !== 200) {
     return null;