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

Make in progress default #1443

Merged
merged 3 commits into from
Dec 12, 2023
Merged

Make in progress default #1443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ac9628
Make in progress default
jadmsaadaot Dec 12, 2023
1bb1e3b
Remove unused code
jadmsaadaot Dec 12, 2023
6f4caed
Remove unused prop
jadmsaadaot Dec 12, 2023
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
6 changes: 3 additions & 3 deletions epictrack-web/src/components/NoResultsFound/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from "react";
import { Container, Grid } from "@mui/material";
import { Box, Container, Grid } from "@mui/material";
import { ETHeading1, ETHeading3, ETPageContainer } from "../shared";
import { Palette } from "../../styles/theme";
import SearchIcon from "@mui/icons-material/Search";
import SearchIcon from "../../assets/images/search.svg";

const NoResultsFound = () => {
return (
Expand All @@ -23,7 +23,7 @@ const NoResultsFound = () => {
spacing={2}
>
<Grid item>
<SearchIcon sx={{ height: "3em", width: "3em" }} />
<Box component="img" src={SearchIcon} alt="Search" width="32px" />
</Grid>
<Grid item>
<ETHeading1
Expand Down
2 changes: 1 addition & 1 deletion epictrack-web/src/components/myWorkplans/Filters/NameFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect, useRef } from "react";
import React, { useRef } from "react";
import { TextField } from "@mui/material";
import debounce from "lodash/debounce";
import {
Expand Down
10 changes: 8 additions & 2 deletions epictrack-web/src/components/myWorkplans/Filters/WorkStateFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ export const WorkStateFilter = () => {
const { setSearchOptions } = useContext(MyWorkplansContext);

const options = Object.values(WORK_STATE).map((state) => ({
label: state,
value: state,
label: state.label,
value: state.value,
}));

return (
Expand All @@ -27,6 +27,12 @@ export const WorkStateFilter = () => {
name="workState"
isMulti
info={true}
defaultValue={[
{
label: WORK_STATE.IN_PROGRESS.label,
value: WORK_STATE.IN_PROGRESS.value,
},
]}
/>
);
};
10 changes: 5 additions & 5 deletions epictrack-web/src/components/myWorkplans/Filters/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ const Filters = () => {
<NameFilter />
</Grid>
<Grid item xs container spacing={2} justifyContent="flex-end">
<Grid item>
<Grid item xs={2}>
<TeamFilter />
</Grid>
<Grid item>
<Grid item xs={2}>
<WorkTypeFilter />
</Grid>
<Grid item>
<Grid item xs={2}>
<ProjectTypeFilter />
</Grid>
<Grid item>
<Grid item xs={2}>
<EnvRegionFilter />
</Grid>
<Grid item>
<Grid item xs={2}>
<WorkStateFilter />
</Grid>
</Grid>
Expand Down
31 changes: 25 additions & 6 deletions epictrack-web/src/components/shared/constants.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,29 @@
export const WORK_STATE = Object.freeze({
SUSPENDED: "SUSPENDED",
IN_PROGRESS: "IN_PROGRESS",
WITHDRAWN: "WITHDRAWN",
TERMINATED: "TERMINATED",
CLOSED: "CLOSED",
COMPLETED: "COMPLETED",
SUSPENDED: {
value: "SUSPENDED",
label: "Suspended",
},
IN_PROGRESS: {
value: "IN_PROGRESS",
label: "In Progress",
},
WITHDRAWN: {
value: "WITHDRAWN",
label: "Withdrawn",
},

TERMINATED: {
value: "TERMINATED",
label: "Terminated",
},
CLOSED: {
value: "CLOSED",
label: "Closed",
},
COMPLETED: {
value: "COMPLETED",
label: "Completed",
},
});

export const REGIONS = Object.freeze({
Expand Down
12 changes: 5 additions & 7 deletions epictrack-web/src/components/shared/filterSelect/FilterSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { Palette } from "../../../styles/theme";
import SingleValue from "./components/SingleValueContainer";
import DropdownIndicator from "./components/DropDownIndicator";
import { MET_Header_Font_Weight_Regular } from "../../../styles/constants";
import clsx from "clsx";

// const useStyle = makeStyles({
// infoSelect: {
Expand All @@ -25,10 +24,13 @@ import clsx from "clsx";

const FilterSelect = (props: SelectProps) => {
// const classes = useStyle();
const { name, isMulti } = props;
const { name, isMulti, defaultValue } = props;
const standardDefault = isMulti ? [] : "";
const [options, setOptions] = React.useState<OptionType[]>([]);
const [selectedOptions, setSelectedOptions] = React.useState<any>();
const [selectValue, setSelectValue] = React.useState<any>(isMulti ? [] : "");
const [selectValue, setSelectValue] = React.useState<any>(
props.defaultValue || standardDefault
);
const [menuIsOpen, setMenuIsOpen] = React.useState<boolean>(
!!props.menuIsOpen
);
Expand All @@ -48,10 +50,6 @@ const FilterSelect = (props: SelectProps) => {
const isOptionSelected = (o: OptionType) =>
isMulti ? selectedOptions.includes(o.value) : selectedOptions === o.value;

React.useEffect(() => {
setSelectValue(isMulti ? [] : "");
}, []);

React.useEffect(() => {
const currentValues = isMulti
? selectValue.map((v: OptionType) => v.value)
Expand Down
Loading