hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-16 14:33:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move user/group queries from app to component uE's

Browse Source
This commit is contained in:
Nathan Barber
2022-08-03 12:28:05 -04:00
parent e9eca22e3b
commit 72db4624e0
2 changed files with 38 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
jsx/src/App.jsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect } from "react";
import React from "react";
import ReactDOM from "react-dom";
import { Provider } from "react-redux";
import { createStore } from "redux";
@@ -19,33 +19,33 @@ import "./style/root.css";
const store = createStore(reducers, initialState);
const App = () => {
useEffect(() => {
let { limit, user_page, groups_page } = initialState;
let api = withAPI()().props;
api
.updateUsers(user_page * limit, limit)
.then((data) => {
console.log(data);
let { _pagination, items } = data;
store.dispatch({
type: "USER_PAGE",
value: { data: items, page: _pagination },
});
})
.catch((err) => console.log(err));
// useEffect(() => {
// let { limit, user_page, groups_page } = initialState;
// let api = withAPI()().props;
// api
// .updateUsers(user_page * limit, limit)
// .then((data) => {
// console.log(data);
// let { _pagination, items } = data;
// store.dispatch({
// type: "USER_PAGE",
// value: { data: items, page: _pagination },
// });
// })
// .catch((err) => console.log(err));
api
.updateGroups(groups_page * limit, limit)
.then((data) => {
console.log(data);
let { _pagination, items } = data;
store.dispatch({
type: "GROUPS_PAGE",
value: { data: items, page: _pagination },
});
})
.catch((err) => console.log(err));
});
// api
// .updateGroups(groups_page * limit, limit)
// .then((data) => {
// console.log(data);
// let { _pagination, items } = data;
// store.dispatch({
// type: "GROUPS_PAGE",
// value: { data: items, page: _pagination },
// });
// })
// .catch((err) => console.log(err));
// });
return (
<div className="resets">

26
jsx/src/components/Groups/Groups.jsx
View File

@@ -6,8 +6,7 @@ import { Link } from "react-router-dom";
import PaginationFooter from "../PaginationFooter/PaginationFooter";
const Groups = (props) => {
var user_data = useSelector((state) => state.user_data),
groups_data = useSelector((state) => state.groups_data),
var groups_data = useSelector((state) => state.groups_data),
groups_page = useSelector((state) => state.groups_page),
dispatch = useDispatch();
@@ -19,16 +18,6 @@ const Groups = (props) => {
console.log(groups_data, groups_page);
useEffect(() => {
updateGroups(offset, limit).then((data) =>
dispatchPageUpdate(data.items, data._pagination)
);
}, [offset, limit]);
if (!groups_data || !user_data || !groups_page) {
return <div data-testid="no-show"></div>;
}
const dispatchPageUpdate = (data, page) => {
dispatch({
type: "GROUPS_PAGE",
@@ -39,6 +28,16 @@ const Groups = (props) => {
});
};
useEffect(() => {
updateGroups(offset, limit).then((data) =>
dispatchPageUpdate(data.items, data._pagination)
);
}, [offset, limit]);
if (!groups_data || !groups_page) {
return <div data-testid="no-show"></div>;
}
return (
<div className="container" data-testid="container">
<div className="row">
@@ -60,7 +59,6 @@ const Groups = (props) => {
pathname: "/group-edit",
state: {
group_data: e,
user_data: user_data,
},
}}
>
@@ -104,8 +102,6 @@ const Groups = (props) => {
};
Groups.propTypes = {
user_data: PropTypes.array,
groups_data: PropTypes.array,
updateUsers: PropTypes.func,
updateGroups: PropTypes.func,
history: PropTypes.shape({