Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions pkg/app/web/src/modules/applications.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ describe("applicationsSlice reducer", () => {
"disabling": Object {},
"entities": Object {},
"ids": Array [],
"loading": false,
"syncing": Object {},
}
`);
Expand Down
9 changes: 9 additions & 0 deletions pkg/app/web/src/modules/applications.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,19 +103,28 @@ export const applicationsSlice = createSlice({
name: "applications",
initialState: applicationsAdapter.getInitialState<{
adding: boolean;
loading: boolean;
syncing: Record<string, boolean>;
disabling: Record<string, boolean>;
}>({
adding: false,
loading: false,
syncing: {},
disabling: {},
}),
reducers: {},
extraReducers: (builder) => {
builder
.addCase(fetchApplications.pending, (state) => {
state.loading = true;
})
.addCase(fetchApplications.fulfilled, (state, action) => {
applicationsAdapter.removeAll(state);
applicationsAdapter.upsertMany(state, action.payload);
state.loading = false;
})
.addCase(fetchApplications.rejected, (state) => {
state.loading = false;
})
.addCase(fetchApplication.fulfilled, (state, action) => {
if (action.payload) {
Expand Down
31 changes: 28 additions & 3 deletions pkg/app/web/src/pages/applications/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ import {
Drawer,
makeStyles,
Toolbar,
CircularProgress,
} from "@material-ui/core";
import { Add } from "@material-ui/icons";
import CloseIcon from "@material-ui/icons/Close";
import FilterIcon from "@material-ui/icons/FilterList";
import RefreshIcon from "@material-ui/icons/Refresh";
import React, { FC, memo, useEffect, useState } from "react";
import { useDispatch, useSelector } from "react-redux";
import { AddApplicationForm } from "../../components/add-application-form";
Expand All @@ -18,7 +20,7 @@ import { addApplication, fetchApplications } from "../../modules/applications";
import { AppDispatch } from "../../store";
import { selectProjectName } from "../../modules/me";

const useStyles = makeStyles(() => ({
const useStyles = makeStyles((theme) => ({
main: {
display: "flex",
overflow: "hidden",
Expand All @@ -27,15 +29,23 @@ const useStyles = makeStyles(() => ({
toolbarSpacer: {
flexGrow: 1,
},
buttonProgress: {
color: theme.palette.primary.main,
position: "absolute",
top: "50%",
left: "50%",
marginTop: -12,
marginLeft: -12,
},
}));

export const ApplicationIndexPage: FC = memo(function ApplicationIndexPage() {
const classes = useStyles();
const dispatch = useDispatch<AppDispatch>();
const [isOpenForm, setIsOpenForm] = useState(false);
const [isOpenFilter, setIsOpenFilter] = useState(false);
const isAdding = useSelector<AppState, boolean>(
(state) => state.applications.adding
const [isLoading, isAdding] = useSelector<AppState, [boolean, boolean]>(
(state) => [state.applications.loading, state.applications.adding]
);
const projectName = useSelector<AppState, string>((state) =>
selectProjectName(state.me)
Expand All @@ -49,6 +59,10 @@ export const ApplicationIndexPage: FC = memo(function ApplicationIndexPage() {
dispatch(fetchApplications());
};

const handleRefresh = (): void => {
dispatch(fetchApplications());
};

useEffect(() => {
dispatch(fetchApplications());
}, [dispatch]);
Expand All @@ -64,6 +78,17 @@ export const ApplicationIndexPage: FC = memo(function ApplicationIndexPage() {
ADD
</Button>
<div className={classes.toolbarSpacer} />
<Button
color="primary"
startIcon={<RefreshIcon />}
onClick={handleRefresh}
disabled={isLoading}
>
{"REFRESH"}
{isLoading && (
<CircularProgress size={24} className={classes.buttonProgress} />
)}
</Button>
<Button
color="primary"
startIcon={isOpenFilter ? <CloseIcon /> : <FilterIcon />}
Expand Down
12 changes: 12 additions & 0 deletions pkg/app/web/src/pages/deployments/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
} from "@material-ui/core";
import CloseIcon from "@material-ui/icons/Close";
import FilterIcon from "@material-ui/icons/FilterList";
import RefreshIcon from "@material-ui/icons/Refresh";
import dayjs from "dayjs";
import React, {
FC,
Expand Down Expand Up @@ -153,12 +154,23 @@ export const DeploymentIndexPage: FC = memo(function DeploymentIndexPage() {
dispatch(fetchDeployments());
}, [dispatch]);

const handleRefresh = (): void => {
dispatch(fetchDeployments());
};

const dates = Object.keys(groupedDeployments).sort(sortComp);

return (
<div className={classes.root}>
<Toolbar variant="dense">
<div className={classes.toolbarSpacer} />
<Button
color="primary"
startIcon={<RefreshIcon />}
onClick={handleRefresh}
>
{"REFRESH"}
</Button>
<Button
color="primary"
startIcon={isOpenFilter ? <CloseIcon /> : <FilterIcon />}
Expand Down