Commit 953a04f6 authored by Merekeyev Dias's avatar Merekeyev Dias

fixed org list but

parent 725426a5
......@@ -16,21 +16,26 @@ interface Organization {
export const apiSlice = createApi({
reducerPath: 'api',
baseQuery: fetchBaseQuery({
baseUrl: "/esutd/api/organizations",
prepareHeaders: (headers, { getState }) => {
const state = getState() as RootState;
const accessToken = state.auth.token;
baseQuery: async (args, api, extraOptions) => {
const baseQuery = fetchBaseQuery({
baseUrl: "http://77.243.80.217:8080/esutd/api/organizations",
prepareHeaders: (headers, { getState }) => {
const state = getState() as RootState;
const accessToken = state.auth.token;
if (accessToken) {
headers.set("Authorization", `Bearer ${accessToken}`);
}
if (accessToken) {
headers.set("Authorization", `Bearer ${accessToken}`);
}
headers.set("Accept", "*/*");
headers.set("Accept", "application/json");
return headers;
},
}),
return headers;
},
});
const result = await baseQuery(args, api, extraOptions);
return result;
},
tagTypes: ["organizations"],
endpoints: (builder) => ({
getOrganizations: builder.query<Organization[], void>({ // получить информацию
......
......@@ -41,18 +41,9 @@ const HomePage: React.FC = () => {
if (isLoading) {
table = <Spin />
} else if (isSuccess) {
const dataSource = orgs.map((org) => ({
id: org.id,
bin: org.bin,
code: org.code,
name: org.name,
host: org.host,
status: org.status,
key: org.id
}));
table = <Table dataSource={paginatedData(dataSource)} columns={columns} pagination={false} />
table = <Table dataSource={paginatedData(orgs)} columns={columns} pagination={false} />
} else if (isError) {
console.log(error)
table = <div>{error.toString()}</div>
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment