update delete and post apis

Signed-off-by: MohammedAbdi <[email protected]>
spiffe · Sep 11, 2024 · 179f773 · 179f773
1 parent d78eb26
commit 179f773
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 9 deletions.
diff --git a/frontend/src/components/agent-create-join-token.tsx b/frontend/src/components/agent-create-join-token.tsx
@@ -7,6 +7,7 @@ import { serverSelectedFunc } from 'redux/actions';
 import { RootState } from 'redux/reducers';
 import { ToastContainer } from "react-toastify"
 import { showResponseToast, showToast } from './error-api';
+import apiEndpoints from './apiConfig';
 
 type CreateJoinTokenProp = {
   globalServerSelected: string,
@@ -102,7 +103,7 @@ class CreateJoinToken extends Component<CreateJoinTokenProp, CreateJoinTokenStat
 
   getApiTokenEndpoint(): string {
     if (!IsManager) {
-      return GetApiServerUri('/api/agent/createjointoken')
+      return GetApiServerUri(apiEndpoints.spireJoinTokenApi)
     } else if (IsManager && this.state.selectedServer !== "") {
       return GetApiServerUri('/manager-api/agent/createjointoken') + "/" + this.state.selectedServer
     } else {

diff --git a/frontend/src/components/cluster-create.tsx b/frontend/src/components/cluster-create.tsx
@@ -25,7 +25,7 @@ import {
   TornjakServerInfo
 } from './types'
 import { showResponseToast, showToast } from './error-api';
-// import apiEndpoints from './apiConfig';
+import apiEndpoints from './apiConfig';
 
 type ClusterCreateProp = {
   // dispatches a payload for the server trust domain and nodeAttestorPlugin as a ServerInfoType and has a return type of void
@@ -206,7 +206,7 @@ class ClusterCreate extends Component<ClusterCreateProp, ClusterCreateState> {
 
   getApiEntryCreateEndpoint(): string {
     if (!IsManager) {
-      return GetApiServerUri('/api/tornjak/clusters/create')
+      return GetApiServerUri(apiEndpoints.tornjakClustersApi)
     } else if (IsManager && this.state.selectedServer !== "") {
       return GetApiServerUri('/manager-api/tornjak/clusters/create') + "/" + this.state.selectedServer
     } else {

diff --git a/frontend/src/components/cluster-edit.tsx b/frontend/src/components/cluster-edit.tsx
@@ -27,6 +27,7 @@ import {
   DebugServerInfo,
 } from './types';
 import { showResponseToast, showToast } from './error-api';
+import apiEndpoints from './apiConfig';
 
 type ClusterEditProp = {
   // tornjak server debug info of the selected server
@@ -259,7 +260,7 @@ class ClusterEdit extends Component<ClusterEditProp, ClusterEditState> {
 
   getApiEntryCreateEndpoint(): string {
     if (!IsManager) {
-      return GetApiServerUri('/api/tornjak/clusters/edit')
+      return GetApiServerUri(apiEndpoints.tornjakClustersApi)
     }
     if (IsManager && this.state.selectedServer !== "") {
       return GetApiServerUri('/manager-api/tornjak/clusters/edit') + "/" + this.state.selectedServer

diff --git a/frontend/src/components/entry-create.tsx b/frontend/src/components/entry-create.tsx
@@ -47,6 +47,7 @@ import EntryExpiryFeatures from './entry-expiry-features';
 import CreateEntryJson from './entry-create-json';
 import { ToastContainer } from "react-toastify"
 import { showResponseToast, showToast } from './error-api';
+import apiEndpoints from './apiConfig';
 // import PropTypes from "prop-types"; // needed for testing will be removed on last pr
 
 type CreateEntryProp = {
@@ -573,7 +574,7 @@ class CreateEntry extends Component<CreateEntryProp, CreateEntryState> {
 
   getApiEntryCreateEndpoint(): string {
     if (!IsManager) {
-      return GetApiServerUri('/api/entry/create')
+      return GetApiServerUri(apiEndpoints.spireEntriesApi)
     } 
     if (IsManager && this.state.selectedServer !== "") {
       return GetApiServerUri('/manager-api/entry/create') + "/" + this.state.selectedServer

diff --git a/frontend/src/tables/agents-list-table.tsx b/frontend/src/tables/agents-list-table.tsx
@@ -11,6 +11,7 @@ import { AgentsList, AgentsWorkLoadAttestorInfo } from "components/types";
 import { DenormalizedRow } from "carbon-components-react";
 import { RootState } from "redux/reducers";
 import { showResponseToast } from "components/error-api";
+import apiEndpoints from 'components/apiConfig';
 
 // AgentListTable takes in 
 // listTableData: agents data to be rendered on table
@@ -99,7 +100,7 @@ class AgentsListTable extends React.Component<AgentsListTableProp, AgentsListTab
             endpoint = GetApiServerUri('/manager-api/agent/delete') + "/" + this.props.globalServerSelected;
 
         } else {
-            endpoint = GetApiServerUri('/api/agent/delete');
+            endpoint = GetApiServerUri(apiEndpoints.spireAgentsApi);
         }
 
         if (selectedRows !== undefined && selectedRows.length !== 0) {
@@ -138,7 +139,7 @@ class AgentsListTable extends React.Component<AgentsListTableProp, AgentsListTab
             endpoint = GetApiServerUri('/manager-api/agent/ban') + "/" + this.props.globalServerSelected
 
         } else {
-            endpoint = GetApiServerUri('/api/agent/ban')
+            endpoint = GetApiServerUri(apiEndpoints.spireAgentsBanApi)
         }
 
         if (selectedRows === undefined || !selectedRows) return ""

diff --git a/frontend/src/tables/clusters-list-table.tsx b/frontend/src/tables/clusters-list-table.tsx
@@ -11,6 +11,7 @@ import { ClustersList } from "components/types";
 import { DenormalizedRow } from "carbon-components-react";
 import { RootState } from "redux/reducers";
 import { showResponseToast } from "components/error-api";
+import apiEndpoints from 'components/apiConfig';
 
 // ClusterListTable takes in 
 // listTableData: clusters data to be rendered on table
@@ -95,7 +96,7 @@ class ClustersListTable extends React.Component<ClustersListTableProp, ClustersL
             endpoint = GetApiServerUri('/manager-api/tornjak/clusters/delete') + "/" + this.props.globalServerSelected
 
         } else {
-            endpoint = GetApiServerUri('/api/tornjak/clusters/delete')
+            endpoint = GetApiServerUri(apiEndpoints.tornjakClustersApi)
         }
 
         if (!selectedRows) return ""

diff --git a/frontend/src/tables/entries-list-table.tsx b/frontend/src/tables/entries-list-table.tsx
@@ -12,6 +12,7 @@ import { RootState } from "redux/reducers";
 import { DenormalizedRow } from "carbon-components-react";
 import { saveAs } from "file-saver";
 import { showResponseToast } from "components/error-api";
+import apiEndpoints from 'components/apiConfig';
 
 // EntriesListTable takes in 
 // listTableData: entries data to be rendered on table
@@ -88,7 +89,7 @@ class EntriesListTable extends React.Component<EntriesListTableProp, EntriesList
         if (IsManager) {
             endpoint = GetApiServerUri('/manager-api/entry/delete') + "/" + this.props.globalServerSelected
         } else {
-            endpoint = GetApiServerUri('/api/entry/delete')
+            endpoint = GetApiServerUri(apiEndpoints.spireEntriesApi)
         }
         if (selectedRows.length !== 0) {
             for (let i = 0; i < selectedRows.length; i++) {