Skip to content

Commit a3f1162

Browse files
committed
fix: retry building admin page
1 parent 05614d4 commit a3f1162

File tree

1 file changed

+33
-15
lines changed

1 file changed

+33
-15
lines changed

wrongsecrets-balancer/ui/src/pages/AdminPage.js

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React, { useEffect, useState } from 'react';
22
import styled from 'styled-components';
3-
import axios from 'axios';
43
import DataTable, { createTheme } from 'react-data-table-component';
54
import { FormattedRelativeTime, defineMessages, useIntl, FormattedMessage } from 'react-intl';
65
import { selectUnit } from '@formatjs/intl-utils';
@@ -96,10 +95,16 @@ const messages = defineMessages({
9695
function RestartInstanceButton({ team }) {
9796
const [restarting, setRestarting] = useState(false);
9897

99-
const restart = (event) => {
98+
const restart = async (event) => {
10099
event.preventDefault();
101100
setRestarting(true);
102-
axios.post(`/balancer/admin/teams/${team}/restart`).finally(() => setRestarting(false));
101+
try {
102+
await fetch(`/balancer/admin/teams/${team}/restart`, {
103+
method: 'POST',
104+
});
105+
} finally {
106+
setRestarting(false);
107+
}
103108
};
104109
return (
105110
<SmallSecondary onClick={restart}>
@@ -115,10 +120,16 @@ function RestartInstanceButton({ team }) {
115120
function RestartDesktopInstanceButton({ team }) {
116121
const [restarting, setRestarting] = useState(false);
117122

118-
const restart = (event) => {
123+
const restart = async (event) => {
119124
event.preventDefault();
120125
setRestarting(true);
121-
axios.post(`/balancer/admin/teams/${team}/restartdesktop`).finally(() => setRestarting(false));
126+
try {
127+
await fetch(`/balancer/admin/teams/${team}/restartdesktop`, {
128+
method: 'POST',
129+
});
130+
} finally {
131+
setRestarting(false);
132+
}
122133
};
123134
return (
124135
<SmallSecondary onClick={restart}>
@@ -136,13 +147,20 @@ const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
136147
function DeleteInstanceButton({ team }) {
137148
const [deleting, setDeleting] = useState(false);
138149

139-
const remove = (event) => {
150+
const remove = async (event) => {
140151
event.preventDefault();
141152
setDeleting(true);
142153

143-
Promise.all([sleep(3000), axios.delete(`/balancer/admin/teams/${team}/delete`)]).finally(() =>
144-
setDeleting(false)
145-
);
154+
try {
155+
await Promise.all([
156+
sleep(3000),
157+
fetch(`/balancer/admin/teams/${team}/delete`, {
158+
method: 'DELETE',
159+
}),
160+
]);
161+
} finally {
162+
setDeleting(false);
163+
}
146164
};
147165
return (
148166
<WarnSmallSecondary onClick={remove}>
@@ -185,17 +203,17 @@ export default function AdminPage() {
185203
const columns = [
186204
{
187205
name: formatMessage(messages.teamname),
188-
selector: 'team',
206+
selector: row => row.team,
189207
sortable: true,
190208
},
191209
{
192210
name: formatMessage(messages.name),
193-
selector: 'name',
211+
selector: row => row.name,
194212
sortable: true,
195213
},
196214
{
197215
name: formatMessage(messages.ready),
198-
selector: 'ready',
216+
selector: row => row.ready,
199217
sortable: true,
200218
right: true,
201219
// ready is just a emoji, so the colum can shrink
@@ -204,7 +222,7 @@ export default function AdminPage() {
204222
},
205223
{
206224
name: formatMessage(messages.created),
207-
selector: 'createdAt',
225+
selector: row => row.createdAt,
208226
sortable: true,
209227
format: ({ createdAt }) => {
210228
const { value, unit } = selectUnit(createdAt);
@@ -217,7 +235,7 @@ export default function AdminPage() {
217235
},
218236
{
219237
name: formatMessage(messages.lastUsed),
220-
selector: 'lastConnect',
238+
selector: row => row.lastConnect,
221239
sortable: true,
222240
format: ({ lastConnect }) => {
223241
const { value, unit } = selectUnit(lastConnect);
@@ -230,7 +248,7 @@ export default function AdminPage() {
230248
},
231249
{
232250
name: formatMessage(messages.actions),
233-
selector: 'actions',
251+
selector: row => row.actions,
234252
right: true,
235253
cell: ({ team }) => {
236254
return (

0 commit comments

Comments
 (0)