Skip to content

Use swagger api for Site Replication Status #3208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 25, 2024
Merged

Use swagger api for Site Replication Status #3208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5fbe52
Use swagger api for Site Replication Status
Jan 20, 2024
385cb52
remove async when there is no await
Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 26 additions & 14 deletions web-app/src/screens/Console/Configurations/SiteReplication/SiteReplicationStatus.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,19 @@ import {
import { useNavigate } from "react-router-dom";
import { IAM_PAGES } from "../../../../common/SecureComponent/permissions";
import { useAppDispatch } from "../../../../store";
import { setHelpName } from "../../../../systemSlice";
import useApi from "../../Common/Hooks/useApi";
import { setErrorSnackMessage, setHelpName } from "../../../../systemSlice";
import StatusCountCard from "../../Dashboard/BasicDashboard/StatusCountCard";
import EntityReplicationLookup from "./EntityReplicationLookup";
import TooltipWrapper from "../../Common/TooltipWrapper/TooltipWrapper";
import PageHeaderWrapper from "../../Common/PageHeaderWrapper/PageHeaderWrapper";
import HelpMenu from "../../HelpMenu";
import { api } from "api";
import { errorToHandler } from "api/errors";
import {
ApiError,
HttpResponse,
SiteReplicationStatusResponse,
} from "api/consoleApi";

export type StatsResponseType = {
maxBuckets?: number;
Expand Down Expand Up @@ -91,15 +97,7 @@ const SiteReplicationStatus = () => {
const navigate = useNavigate();

const [stats, setStats] = useState<StatsResponseType>({});

const [isStatsLoading, invokeSiteStatsApi] = useApi(
(res: any) => {
setStats(res);
},
(err: any) => {
setStats({});
},
);
const [loading, setLoading] = useState<boolean>(false);

const {
maxBuckets = 0,
Expand All @@ -113,8 +111,22 @@ const SiteReplicationStatus = () => {
} = stats || {};

const getStats = () => {
let url = `api/v1/admin/site-replication/status?buckets=true&groups=true&policies=true&users=true`;
invokeSiteStatsApi("GET", url);
setLoading(true);
api.admin
.getSiteReplicationStatus({
buckets: true,
groups: true,
policies: true,
users: true,
})
.then((res: HttpResponse<SiteReplicationStatusResponse, ApiError>) => {
setStats(res.data);
})
.catch((res: HttpResponse<SiteReplicationStatusResponse, ApiError>) => {
setStats({});
dispatch(setErrorSnackMessage(errorToHandler(res.error)));
})
.finally(() => setLoading(false));
};

useEffect(() => {
Expand Down Expand Up @@ -163,7 +175,7 @@ const SiteReplicationStatus = () => {
Replication status from all Sites
</SectionTitle>

{!isStatsLoading ? (
{!loading ? (
<Box
sx={{
display: "grid",
Expand Down
2 changes: 1 addition & 1 deletion web-app/src/screens/Console/IDP/AddIDPConfiguration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ const AddIDPConfiguration = ({
navigate(backLink);
dispatch(setServerNeedsRestart(res.data.restart === true));
})
.catch(async (res: HttpResponse<SetIDPResponse, ApiError>) => {
.catch((res: HttpResponse<SetIDPResponse, ApiError>) => {
dispatch(setErrorSnackMessage(errorToHandler(res.error)));
})
.finally(() => setLoadingCreate(false));
Expand Down
6 changes: 3 additions & 3 deletions web-app/src/screens/Console/Support/GetApiKeyModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const GetApiKeyModal = ({ open, closeModal, onSet }: IGetApiKeyModalProps) => {
getApiKey(res.data.access_token);
}
})
.catch(async (res: HttpResponse<SubnetLoginResponse, ApiError>) => {
.catch((res: HttpResponse<SubnetLoginResponse, ApiError>) => {
onError(res.error);
})
.finally(() => setLoadingSave(false));
Expand All @@ -90,7 +90,7 @@ const GetApiKeyModal = ({ open, closeModal, onSet }: IGetApiKeyModalProps) => {
closeModal();
}
})
.catch(async (res: HttpResponse<SubnetLoginResponse, ApiError>) => {
.catch((res: HttpResponse<SubnetLoginResponse, ApiError>) => {
onError(res.error);
})
.finally(() => setLoadingSave(false));
Expand All @@ -105,7 +105,7 @@ const GetApiKeyModal = ({ open, closeModal, onSet }: IGetApiKeyModalProps) => {
setMfaToken(res.data.mfa_token);
}
})
.catch(async (res: HttpResponse<SubnetLoginResponse, ApiError>) => {
.catch((res: HttpResponse<SubnetLoginResponse, ApiError>) => {
onError(res.error);
})
.finally(() => setLoadingSave(false));
Expand Down
2 changes: 1 addition & 1 deletion web-app/src/screens/Console/Support/OfflineRegistration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const OfflineRegistration = () => {
dispatch(fetchLicenseInfo());
dispatch(setServerNeedsRestart(true));
})
.catch(async (res: HttpResponse<SetConfigResponse, ApiError>) => {
.catch((res: HttpResponse<SetConfigResponse, ApiError>) => {
dispatch(setErrorSnackMessage(errorToHandler(res.error)));
})
.finally(() => setLoadingSave(false));
Expand Down