Skip to content
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

#2623 fix user table search by url #1126

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

#2623 fix user table search by url #1126

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ff21ec
Fix UserTable filter
MaksymLiaskovskyi Sep 7, 2022
c28fc4c
deleted old setState
MaksymLiaskovskyi Sep 7, 2022
7f6d946
fix user table search by url
MaksymLiaskovskyi Sep 26, 2022
a1009da
Merge branch 'master' into #2623_Fix_user_table_search_by_url
MaksymLiaskovskyi Sep 29, 2022
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
13 changes: 10 additions & 3 deletions src/pages/City/City/City.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ import AuthLocalStorage from "../../../AuthLocalStorage";
import ModalAddPlastDegree from "../../userPage/ActiveMembership/PlastDegree/ModalAddPlastDegree";
import Breadcrumb from "../../../components/Breadcrumb/Breadcrumb";
import { boolean } from "yup";
import { useUserTableStore } from "../../../stores/UserTableStore";

const City = () => {
const history = useHistory();
Expand Down Expand Up @@ -114,6 +115,7 @@ const City = () => {
const [visibleAddModalDegree, setVisibleAddModalDegree] = useState<boolean>(
false
);
const [state, actions] = useUserTableStore();
const documentsToShow = 6;
const adminsToShow = 6;
const membersToShow = 9;
Expand Down Expand Up @@ -898,7 +900,10 @@ const City = () => {
className="cityInfoButton"
onClick={() => {
if (userAccesses["EditCity"])
history.push(`/user/table?city=${city.id}`);
{
actions.setCities([city.id]);
history.push(`/user/table`);
}
else history.push(`/cities/members/${city.id}`);
}}
>
Expand Down Expand Up @@ -1163,8 +1168,10 @@ const City = () => {
type="primary"
className="cityInfoButton"
onClick={() => {
if (userAccesses["EditCity"])
history.push(`/user/table?tab=registered&city=${city.id}`);
if (userAccesses["EditCity"]){
actions.setCities([city.id]);
history.push(`/user/table?tab=registered`);
}
else history.push(`/cities/followers/${city.id}`);
}}
>
Expand Down
14 changes: 10 additions & 4 deletions src/pages/Club/Club/Club.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ import PsevdonimCreator from "../../../components/HistoryNavi/historyPseudo";
import AddClubsNewSecretaryForm from "../AddAdministratorModal/AddClubsSecretaryForm";
import { Roles } from "../../../models/Roles/Roles";
import Breadcrumb from "../../../components/Breadcrumb/Breadcrumb";
import { useUserTableStore } from "../../../stores/UserTableStore";

const sloganMaxLength = 38;

Expand Down Expand Up @@ -110,6 +111,7 @@ const Club = () => {
const [isLoadingPlus, setIsLoadingPlus] = useState<boolean>(true);
const [isLoadingMemberId, setIsLoadingMemberId] = useState<number>(0);
const [isActiveClub, setIsActiveClub] = useState<boolean>(true);
const [state, actions] = useUserTableStore();
const classes = require("./Modal.module.css");

const changeApproveStatus = async (memberId: number) => {
Expand Down Expand Up @@ -981,8 +983,10 @@ const Club = () => {
type="primary"
className="clubInfoButton"
onClick={() => {
if (userAccesses.EditClub)
history.push(`/user/table?club=${club.id}`);
if (userAccesses.EditClub){
actions.setClubs([club.id]);
history.push(`/user/table`);
}
else history.push(`/clubs/members/${club.id}`);
}}
>
Expand Down Expand Up @@ -1219,8 +1223,10 @@ const Club = () => {
type="primary"
className="clubInfoButton"
onClick={() => {
if (userAccesses.EditClub)
history.push(`/user/table?tab=registered&club=${club.id}`);
if (userAccesses.EditClub){
actions.setClubs([club.id]);
history.push(`/user/table?tab=registered`);
}
else history.push(`/clubs/followers/${club.id}`);
}}
>
Expand Down
8 changes: 4 additions & 4 deletions src/pages/UserTable/Interfaces/TableFilterParameters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
interface TableFilterParameters {
Page: number;
PageSize: number;
Cities?: Array<string>;
Regions?: Array<string>;
Clubs?: Array<string>;
Degrees?: Array<string>;
Cities?: Array<number>;
Regions?: Array<number>;
Clubs?: Array<number>;
Degrees?: Array<number>;
Tab: string;
SortKey: number;
FilterRoles?: Array<string>;
Expand Down
Loading