Skip to content

Commit fa2772d

Browse files
TsurutaYoshikiTsurutaYoshiki
committed
delete useSkipUntilAuthUserIsReady
1 parent a7abfdb commit fa2772d

20 files changed

+39
-47
lines changed

‎web/src/components/PTeamLabel.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { Settings as SettingsIcon } from "@mui/icons-material";
22
import { Box, IconButton, Typography } from "@mui/material";
33
import PropTypes from "prop-types";
44
import React, { useState } from "react";
5+
import { useSelector } from "react-redux";
56

6-
import { useSkipUntilAuthUserIsReady } from "../hooks/auth";
77
import { useGetUserMeQuery } from "../services/tcApi";
88
import { APIError } from "../utils/APIError";
99
import { errorToString } from "../utils/func";
@@ -16,7 +16,7 @@ export function PTeamLabel(props) {
1616

1717
const [pteamSettingsModalOpen, setPTeamSettingsModalOpen] = useState(false);
1818

19-
const skip = useSkipUntilAuthUserIsReady();
19+
const skip = !useSelector((state) => state.auth.authUserIsReady);
2020

2121
const {
2222
data: userMe,

‎web/src/components/PTeamSettingsModal.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import {
1212
import { grey } from "@mui/material/colors";
1313
import PropTypes from "prop-types";
1414
import React, { useState } from "react";
15+
import { useSelector } from "react-redux";
1516

1617
import { TabPanel } from "../components/TabPanel";
1718
import dialogStyle from "../cssModule/dialog.module.css";
18-
import { useSkipUntilAuthUserIsReady } from "../hooks/auth";
1919
import { useGetPTeamQuery } from "../services/tcApi";
2020
import { APIError } from "../utils/APIError";
2121
import { a11yProps, errorToString } from "../utils/func.js";
@@ -27,7 +27,7 @@ export function PTeamSettingsModal(props) {
2727
const { pteamId, onSetShow, show, defaultTabIndex } = props;
2828
const [tab, setTab] = useState(defaultTabIndex ?? 0);
2929

30-
const skip = useSkipUntilAuthUserIsReady() || !pteamId;
30+
const skip = !useSelector((state) => state.auth.authUserIsReady) || !pteamId;
3131

3232
const {
3333
data: pteam,

‎web/src/hooks/auth.js

-8
This file was deleted.

‎web/src/pages/AcceptPTeamInvitation/AcceptPTeamInvitationPage.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { Box, Button, Typography } from "@mui/material";
22
import { useSnackbar } from "notistack";
33
import React from "react";
44
import { useLocation, useNavigate } from "react-router-dom";
5+
import { useSelector } from "react-redux";
56

6-
import { useSkipUntilAuthUserIsReady } from "../../hooks/auth";
77
import { useApplyPTeamInvitationMutation, useGetPTeamInvitationQuery } from "../../services/tcApi";
88
import { APIError } from "../../utils/APIError";
99
import { commonButtonStyle } from "../../utils/const";
@@ -19,7 +19,7 @@ export function AcceptPTeamInvitation() {
1919
const params = new URLSearchParams(useLocation().search);
2020
const tokenId = params.get("token");
2121

22-
const skip = useSkipUntilAuthUserIsReady();
22+
const skip = !useSelector((state) => state.auth.authUserIsReady);
2323
const {
2424
data: detail,
2525
error: detailError,

‎web/src/pages/Account/AccountPage.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import {
1212
import { grey } from "@mui/material/colors";
1313
import { useSnackbar } from "notistack";
1414
import React, { useState } from "react";
15+
import { useSelector } from "react-redux";
1516

1617
import { UUIDTypography } from "../../components/UUIDTypography";
17-
import { useSkipUntilAuthUserIsReady } from "../../hooks/auth";
1818
import { useGetUserMeQuery, useUpdateUserMutation } from "../../services/tcApi";
1919
import { APIError } from "../../utils/APIError";
2020
import { errorToString } from "../../utils/func";
@@ -28,7 +28,7 @@ export function Account() {
2828
const { enqueueSnackbar } = useSnackbar();
2929

3030
const [updateUser] = useUpdateUserMutation();
31-
const skip = useSkipUntilAuthUserIsReady();
31+
const skip = !useSelector((state) => state.auth.authUserIsReady);
3232
const {
3333
data: userMe,
3434
error: userMeError,

‎web/src/pages/App/OutletWithCheckedParams.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useEffect } from "react";
22
import { Outlet, useLocation, useNavigate } from "react-router-dom";
3+
import { useSelector } from "react-redux";
34

4-
import { useSkipUntilAuthUserIsReady } from "../../hooks/auth";
55
import { useGetUserMeQuery } from "../../services/tcApi";
66
import { APIError } from "../../utils/APIError";
77
import { errorToString } from "../../utils/func";
@@ -11,7 +11,7 @@ export function OutletWithCheckedParams() {
1111
const navigate = useNavigate();
1212
const location = useLocation();
1313

14-
const skip = useSkipUntilAuthUserIsReady();
14+
const skip = !useSelector((state) => state.auth.authUserIsReady);
1515

1616
const {
1717
data: userMe,

‎web/src/pages/App/TeamSelector.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { Box, Button, Menu, MenuItem } from "@mui/material";
33
import { grey } from "@mui/material/colors";
44
import React, { useEffect, useMemo, useState } from "react";
55
import { useLocation, useNavigate } from "react-router-dom";
6+
import { useSelector } from "react-redux";
67

7-
import { useSkipUntilAuthUserIsReady } from "../../hooks/auth";
88
import { useGetUserMeQuery } from "../../services/tcApi";
99
import { APIError } from "../../utils/APIError";
1010
import { LocationReader } from "../../utils/LocationReader";
@@ -35,7 +35,7 @@ export function TeamSelector() {
3535
const [openPTeamCreationModal, setOpenPTeamCreationModal] = useState(false);
3636
const locationReader = useMemo(() => new LocationReader(location), [location]);
3737

38-
const skip = useSkipUntilAuthUserIsReady();
38+
const skip = !useSelector((state) => state.auth.authUserIsReady);
3939
const {
4040
data: userMe,
4141
error: userMeError,

‎web/src/pages/PTeam/PTeamMemberMenu.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import {
66
import { Button, Dialog, DialogContent, Menu, MenuItem } from "@mui/material";
77
import PropTypes from "prop-types";
88
import React, { useState } from "react";
9+
import { useSelector } from "react-redux";
910

10-
import { useSkipUntilAuthUserIsReady } from "../../hooks/auth";
1111
import { useGetPTeamQuery, useGetUserMeQuery } from "../../services/tcApi";
1212
import { APIError } from "../../utils/APIError";
1313
import { errorToString, checkAdmin } from "../../utils/func";
@@ -23,7 +23,7 @@ export function PTeamMemberMenu(props) {
2323
const [anchorEl, setAnchorEl] = useState(null);
2424
const open = Boolean(anchorEl);
2525

26-
const skip = useSkipUntilAuthUserIsReady() || !pteamId;
26+
const skip = !useSelector((state) => state.auth.authUserIsReady) || !pteamId;
2727
const {
2828
data: userMe,
2929
error: userMeError,

‎web/src/pages/PTeam/PTeamPage.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { Avatar, Box, Tab, Tabs, Tooltip } from "@mui/material";
22
import React, { useState } from "react";
33
import { useLocation } from "react-router";
4+
import { useSelector } from "react-redux";
45

56
import { PTeamLabel } from "../../components/PTeamLabel";
67
import { TabPanel } from "../../components/TabPanel";
7-
import { useSkipUntilAuthUserIsReady } from "../../hooks/auth";
88
import { useGetPTeamMembersQuery } from "../../services/tcApi";
99
import { APIError } from "../../utils/APIError";
1010
import { experienceColors, noPTeamMessage } from "../../utils/const";
@@ -19,7 +19,7 @@ export function PTeam() {
1919
const params = new URLSearchParams(location.search);
2020
const pteamId = params.get("pteamId");
2121

22-
const skip = useSkipUntilAuthUserIsReady() || !pteamId;
22+
const skip = !useSelector((state) => state.auth.authUserIsReady) || !pteamId;
2323
const {
2424
data: members,
2525
error: membersError,

‎web/src/pages/Status/PTeamServiceDelete.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import { useSnackbar } from "notistack";
1313
import PropTypes from "prop-types";
1414
import React, { useState } from "react";
1515
import { useLocation, useNavigate } from "react-router";
16+
import { useSelector } from "react-redux";
1617

1718
import styles from "../../cssModule/dialog.module.css";
18-
import { useSkipUntilAuthUserIsReady } from "../../hooks/auth";
1919
import { useDeletePTeamServiceMutation, useGetPTeamQuery } from "../../services/tcApi";
2020
import { APIError } from "../../utils/APIError";
2121
import { errorToString } from "../../utils/func";
@@ -32,7 +32,7 @@ export function PTeamServiceDelete(props) {
3232
const params = new URLSearchParams(location.search);
3333
const serviceId = params.get("serviceId");
3434

35-
const skip = useSkipUntilAuthUserIsReady() || !!pteamId;
35+
const skip = !useSelector((state) => state.auth.authUserIsReady) || !!pteamId;
3636
const {
3737
data: pteam,
3838
error: pteamError,

‎web/src/pages/Status/PTeamServicesListModal.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import { grey } from "@mui/material/colors";
2121
import PropTypes from "prop-types";
2222
import React, { useState } from "react";
2323
import { useNavigate, useLocation } from "react-router-dom";
24+
import { useSelector } from "react-redux";
2425

25-
import { useSkipUntilAuthUserIsReady } from "../../hooks/auth";
2626
import { useGetPTeamServiceThumbnailQuery, useGetPTeamQuery } from "../../services/tcApi";
2727
import { APIError } from "../../utils/APIError";
2828
import { errorToString } from "../../utils/func";
@@ -84,7 +84,7 @@ export function PTeamServicesListModal(props) {
8484
const params = new URLSearchParams(useLocation().search);
8585
const pteamId = params.get("pteamId");
8686

87-
const skip = useSkipUntilAuthUserIsReady() || !pteamId;
87+
const skip = !useSelector((state) => state.auth.authUserIsReady) || !pteamId;
8888
const {
8989
data: pteam,
9090
error: pteamError,

‎web/src/pages/Status/StatusPage.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ import PropTypes from "prop-types";
2929
import React, { useEffect, useState } from "react";
3030
import { ErrorBoundary } from "react-error-boundary";
3131
import { useLocation, useNavigate } from "react-router";
32+
import { useSelector } from "react-redux";
3233

3334
import { Android12Switch } from "../../components/Android12Switch";
3435
import { PTeamLabel } from "../../components/PTeamLabel";
35-
import { useSkipUntilAuthUserIsReady } from "../../hooks/auth";
3636
import {
3737
useGetPTeamQuery,
3838
useGetPTeamTagsSummaryQuery,
@@ -141,7 +141,7 @@ export function Status() {
141141
serviceIds: [],
142142
});
143143

144-
const skipByAuth = useSkipUntilAuthUserIsReady();
144+
const skipByAuth = !useSelector((state) => state.auth.authUserIsReady);
145145

146146
const {
147147
data: pteam,

‎web/src/pages/Tag/PTeamTaggedTopics.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Box, List, ListItem, MenuItem, Pagination, Select, Typography } from "@mui/material";
22
import PropTypes from "prop-types";
33
import React, { useState } from "react";
4+
import { useSelector } from "react-redux";
45

5-
import { useSkipUntilAuthUserIsReady } from "../../hooks/auth";
66
import { useGetPTeamMembersQuery } from "../../services/tcApi";
77
import { APIError } from "../../utils/APIError";
88
import { sortedSSVCPriorities } from "../../utils/const";
@@ -17,7 +17,7 @@ export function PTeamTaggedTopics(props) {
1717
const [page, setPage] = useState(1);
1818
const [perPage, setPerPage] = useState(10);
1919

20-
const skip = useSkipUntilAuthUserIsReady() || !pteamId;
20+
const skip = !useSelector((state) => state.auth.authUserIsReady) || !pteamId;
2121

2222
const {
2323
data: members,

‎web/src/pages/Tag/ReportCompletedActions.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import { grey } from "@mui/material/colors";
1414
import { useSnackbar } from "notistack";
1515
import PropTypes from "prop-types";
1616
import React, { useState } from "react";
17+
import { useSelector } from "react-redux";
1718

1819
import { ActionTypeIcon } from "../../components/ActionTypeIcon";
1920
import { UUIDTypography } from "../../components/UUIDTypography";
2021
import dialogStyle from "../../cssModule/dialog.module.css";
21-
import { useSkipUntilAuthUserIsReady } from "../../hooks/auth";
2222
import {
2323
useCreateActionLogMutation,
2424
useUpdateTicketStatusMutation,
@@ -40,7 +40,7 @@ export function ReportCompletedActions(props) {
4040

4141
const { enqueueSnackbar } = useSnackbar();
4242

43-
const skip = useSkipUntilAuthUserIsReady();
43+
const skip = !useSelector((state) => state.auth.authUserIsReady);
4444
const {
4545
data: userMe,
4646
error: userMeError,

‎web/src/pages/Tag/TagPage.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import { Box, Divider, Tab, Tabs, Typography, Chip } from "@mui/material";
22
import { grey } from "@mui/material/colors";
33
import React, { useState } from "react";
44
import { useParams, useLocation } from "react-router-dom";
5+
import { useSelector } from "react-redux";
56

67
import { TabPanel } from "../../components/TabPanel";
78
import { UUIDTypography } from "../../components/UUIDTypography";
8-
import { useSkipUntilAuthUserIsReady } from "../../hooks/auth";
99
import {
1010
useGetPTeamQuery,
1111
useGetPTeamServiceTaggedTopicIdsQuery,
@@ -22,7 +22,7 @@ import { TagReferences } from "./TagReferences.jsx";
2222
export function Tag() {
2323
const [tabValue, setTabValue] = useState(0);
2424

25-
const skipByAuth = useSkipUntilAuthUserIsReady();
25+
const skipByAuth = !useSelector((state) => state.auth.authUserIsReady);
2626
const {
2727
data: allTags,
2828
error: allTagsError,

‎web/src/pages/Tag/TopicCard.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import { grey } from "@mui/material/colors";
1616
import PropTypes from "prop-types";
1717
import React, { useState } from "react";
1818
import { useParams } from "react-router-dom";
19+
import { useSelector } from "react-redux";
1920

2021
import { UUIDTypography } from "../../components/UUIDTypography";
21-
import { useSkipUntilAuthUserIsReady } from "../../hooks/auth";
2222
import {
2323
useGetPTeamTopicActionsQuery,
2424
useGetTicketsQuery,
@@ -41,7 +41,7 @@ export function TopicCard(props) {
4141
const [detailOpen, setDetailOpen] = useState(false);
4242
const [actionFilter, setActionFilter] = useState(true);
4343

44-
const skipByAuth = useSkipUntilAuthUserIsReady();
44+
const skipByAuth = !useSelector((state) => state.auth.authUserIsReady);
4545
const {
4646
data: topic,
4747
error: topicError,

‎web/src/pages/Tag/TopicTagSelector.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import { useSnackbar } from "notistack";
1919
import PropTypes from "prop-types";
2020
import React, { useEffect, useState } from "react";
2121
import { FixedSizeList } from "react-window";
22+
import { useSelector } from "react-redux";
2223

2324
import dialogStyle from "../../cssModule/dialog.module.css";
24-
import { useSkipUntilAuthUserIsReady } from "../../hooks/auth";
2525
import { useCreateTagMutation, useGetTagsQuery } from "../../services/tcApi";
2626
import { APIError } from "../../utils/APIError";
2727
import { commonButtonStyle } from "../../utils/const";
@@ -38,7 +38,7 @@ export function TopicTagSelector(props) {
3838

3939
const [createTag] = useCreateTagMutation();
4040

41-
const skip = useSkipUntilAuthUserIsReady();
41+
const skip = !useSelector((state) => state.auth.authUserIsReady);
4242
const {
4343
data: allTags,
4444
error: allTagsError,

‎web/src/pages/Tag/TopicTicketAccordion.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import { grey } from "@mui/material/colors";
1818
import { styled } from "@mui/material/styles";
1919
import PropTypes from "prop-types";
2020
import React from "react";
21+
import { useSelector } from "react-redux";
2122

2223
import { SSVCPriorityStatusChip } from "../../components/SSVCPriorityStatusChip";
23-
import { useSkipUntilAuthUserIsReady } from "../../hooks/auth";
2424
import { useGetThreatQuery } from "../../services/tcApi";
2525
import { APIError } from "../../utils/APIError";
2626
import {
@@ -71,7 +71,7 @@ export function TopicTicketAccordion(props) {
7171
const ticketStatus = ticket.ticket_status;
7272
const ssvcPriority = ticket.ssvc_deployer_priority || "defer";
7373

74-
const skipByAuth = useSkipUntilAuthUserIsReady();
74+
const skipByAuth = !useSelector((state) => state.auth.authUserIsReady);
7575
const {
7676
data: threat,
7777
error: threatError,

‎web/src/pages/TopicDetail/TopicDetailPage.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import {
1818
import { green, grey, yellow } from "@mui/material/colors";
1919
import React, { useState } from "react";
2020
import { useParams } from "react-router-dom";
21+
import { useSelector } from "react-redux";
2122

2223
import { ActionTypeIcon } from "../../components/ActionTypeIcon";
23-
import { useSkipUntilAuthUserIsReady } from "../../hooks/auth";
2424
import { useGetTopicActionsQuery, useGetTopicQuery } from "../../services/tcApi";
2525
import { APIError } from "../../utils/APIError";
2626
import { cvssProps } from "../../utils/const";
@@ -49,7 +49,7 @@ export function TopicDetail() {
4949

5050
const [showAllArtifacts, setShowAllArtifacts] = useState(false);
5151

52-
const skip = useSkipUntilAuthUserIsReady();
52+
const skip = !useSelector((state) => state.auth.authUserIsReady);
5353
const {
5454
data: topic,
5555
error: topicError,

‎web/src/pages/TopicManagement/TopicManagementPage.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ import PropTypes from "prop-types";
2929
import React, { useState } from "react";
3030
import { useNavigate } from "react-router";
3131
import { useLocation } from "react-router-dom";
32+
import { useSelector } from "react-redux";
3233

3334
import styles from "../../cssModule/button.module.css";
34-
import { useSkipUntilAuthUserIsReady } from "../../hooks/auth";
3535
import {
3636
useGetTopicActionsQuery,
3737
useGetTopicQuery,
@@ -58,7 +58,7 @@ function TopicManagementTableRow(props) {
5858

5959
const params = new URLSearchParams(location.search);
6060

61-
const skip = useSkipUntilAuthUserIsReady();
61+
const skip = !useSelector((state) => state.auth.authUserIsReady);
6262

6363
const {
6464
data: topic,
@@ -147,7 +147,7 @@ export function TopicManagement() {
147147
const [perPage, setPerPage] = useState(perPageItems[0]);
148148
const [searchConditions, setSearchConditions] = useState({});
149149

150-
const skip = useSkipUntilAuthUserIsReady();
150+
const skip = !useSelector((state) => state.auth.authUserIsReady);
151151

152152
const params = new URLSearchParams(useLocation().search);
153153
const pteamId = params.get("pteamId");

0 commit comments

Comments
 (0)