feat: showHidden is already working

NIAEFEUP · Jan 24, 2023 · 04a1c18 · 04a1c18
1 parent 8292ec9
commit 04a1c18
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 14 deletions.
diff --git a/src/actions/searchOffersActions.js b/src/actions/searchOffersActions.js
@@ -15,6 +15,7 @@ export const OfferSearchTypes = Object.freeze({
     DISABLE_OFFER: "DISABLE_OFFER",
     COMPANY_ENABLE_OFFER: "COMPANY_ENABLE_OFFER",
     ADMIN_ENABLE_OFFER: "ADMIN_ENABLE_OFFER",
+    SET_SHOW_HIDDEN: "SET_SHOW_HIDDEN",
 });
 
 export const setLoadingOffers = (loading) => ({
@@ -100,3 +101,8 @@ export const resetAdvancedSearchFields = () => (dispatch) => {
     dispatch(setFields([]));
     dispatch(setTechs([]));
 };
+
+export const setShowHidden = (showHidden) => ({
+    type: OfferSearchTypes.SET_SHOW_HIDDEN,
+    showHidden,
+});
diff --git a/src/components/HomePage/SearchArea/AdvancedSearch/AdvancedSearchDesktop.js b/src/components/HomePage/SearchArea/AdvancedSearch/AdvancedSearchDesktop.js
@@ -53,7 +53,7 @@ const AdvancedSearchDesktop = () => {
     const {
         advancedOptions, resetAdvancedSearch, FieldsSelectorProps, TechsSelectorProps, JobTypeSelectorProps, JobDurationSwitchProps,
         ResetButtonProps, JobDurationSliderText, JobDurationCollapseProps, JobDurationSwitchLabel, JobHiddenSwitchLabel,
-        JobDurationSliderProps,
+        JobDurationSliderProps, ShowHiddenSwitchProps,
     } = useContext(AdvancedSearchControllerContext);
 
     return (
@@ -104,19 +104,19 @@ const AdvancedSearchDesktop = () => {
                     }}
                 />
                 <div className={classes.resetBtnWrapper}>
-                        <Button
-                            {...ResetButtonProps}
-                            _id="reset_btn"
-                            color="primary"
-                            onClick={resetAdvancedSearch}
-                        >
-                            Reset Advanced Fields
-                        </Button>
-                </div>          
+                    <Button
+                        {...ResetButtonProps}
+                        _id="reset_btn"
+                        color="primary"
+                        onClick={resetAdvancedSearch}
+                    >
+                        Reset Advanced Fields
+                    </Button>
+                </div>
                 {sessionData?.isAdmin &&
                     <FormControlLabel
                         className={classes.jobHiddenSliderToggle}
-                        control={<Switch {...JobDurationSwitchProps} />}
+                        control={<Switch {...ShowHiddenSwitchProps} />}
                         label={JobHiddenSwitchLabel}
                     />
                 }

diff --git a/src/components/HomePage/SearchArea/AdvancedSearch/useAdvancedSearch.js b/src/components/HomePage/SearchArea/AdvancedSearch/useAdvancedSearch.js
@@ -19,6 +19,8 @@ export default ({
     technologies,
     setTechs,
     resetAdvancedSearchFields,
+    showHidden,
+    setShowHidden,
 }) => {
 
     const jobDuration = [jobMinDuration, jobMaxDuration];
@@ -72,6 +74,15 @@ export default ({
     const FieldsSelectorProps = useFieldSelector(fields, setFields);
     const TechsSelectorProps = useTechSelector(technologies, setTechs);
 
+    const toggleShowHidden = useCallback(() => {
+        setShowHidden(!showHidden);
+    }, [setShowHidden, showHidden]);
+
+    const ShowHiddenSwitchProps = {
+        checked: showHidden,
+        onChange: toggleShowHidden,
+        value: "filterShowHiddenOffers",
+    };
 
     const advancedOptionsActive = showJobDurationSlider
     || (jobType !== INITIAL_JOB_TYPE)
@@ -104,5 +115,6 @@ export default ({
         JobDurationSliderProps,
         JobDurationSliderText,
         ResetButtonProps,
+        ShowHiddenSwitchProps,
     };
 };
diff --git a/src/components/HomePage/SearchArea/SearchArea.js b/src/components/HomePage/SearchArea/SearchArea.js
@@ -12,6 +12,7 @@ import {
     setShowJobDurationSlider,
     setTechs,
     hideOffer,
+    setShowHidden,
 } from "../../../actions/searchOffersActions";
 import { INITIAL_JOB_TYPE, INITIAL_JOB_DURATION } from "../../../reducers/searchOffersReducer";
 
@@ -37,7 +38,8 @@ export const AdvancedSearchControllerContext = React.createContext({});
 export const AdvancedSearchController = ({
     enableAdvancedSearchDefault, showJobDurationSlider, setShowJobDurationSlider, jobMinDuration,
     jobMaxDuration, setJobDuration, jobType, setJobType, fields, setFields, technologies, setTechs,
-    resetAdvancedSearchFields, onSubmit, searchValue, setSearchValue, onMobileClose,
+    resetAdvancedSearchFields, onSubmit, searchValue, setSearchValue, onMobileClose, showHidden,
+    setShowHidden,
 }) => {
 
     const {
@@ -73,6 +75,8 @@ export const AdvancedSearchController = ({
         setTechs: actualSetTechs,
         resetAdvancedSearchFields: actualResetAdvancedSearchFields,
         hideOffer,
+        showHidden,
+        setShowHidden,
     });
 
     const { search: searchOffers } = useOffersSearcher({
@@ -82,6 +86,7 @@ export const AdvancedSearchController = ({
         jobType,
         fields,
         technologies,
+        showHidden,
     });
 
     const submitForm = useCallback((e, updateUrl = true) => {
@@ -126,7 +131,8 @@ export const AdvancedSearchController = ({
 export const SearchArea = ({ onSubmit, searchValue,
     jobMinDuration = INITIAL_JOB_DURATION, jobMaxDuration = INITIAL_JOB_DURATION + 1, jobType = INITIAL_JOB_TYPE,
     fields, technologies, showJobDurationSlider, setShowJobDurationSlider, advanced: enableAdvancedSearchDefault = false,
-    setSearchValue, setJobDuration, setJobType, setFields, setTechs, resetAdvancedSearchFields, onMobileClose }) => {
+    setSearchValue, setJobDuration, setJobType, setFields, setTechs, resetAdvancedSearchFields, onMobileClose, showHidden,
+    setShowHidden }) => {
 
     const classes = useSearchAreaStyles();
     const {
@@ -142,6 +148,7 @@ export const SearchArea = ({ onSubmit, searchValue,
             enableAdvancedSearchDefault, showJobDurationSlider, setShowJobDurationSlider, jobMinDuration,
             jobMaxDuration, setJobDuration, jobType, setJobType, fields, setFields, technologies, setTechs,
             resetAdvancedSearchFields, hideOffer,  onSubmit, searchValue, setSearchValue, onMobileClose,
+            showHidden, setShowHidden,
         },
         AdvancedSearchControllerContext
     );
@@ -202,6 +209,8 @@ SearchArea.propTypes = {
     setTechs: PropTypes.func.isRequired,
     setShowJobDurationSlider: PropTypes.func.isRequired,
     onMobileClose: PropTypes.func,
+    showHidden: PropTypes.bool,
+    setShowHidden: PropTypes.func,
     advanced: PropTypes.bool,
 };
 
@@ -213,6 +222,7 @@ export const mapStateToProps = ({ offerSearch }) => ({
     fields: offerSearch.fields,
     technologies: offerSearch.technologies,
     showJobDurationSlider: offerSearch.filterJobDuration,
+    showHidden: offerSearch.showHidden,
 });
 
 export const mapDispatchToProps = (dispatch) => ({
@@ -222,6 +232,7 @@ export const mapDispatchToProps = (dispatch) => ({
     setFields: (fields) => dispatch(setFields(fields)),
     setTechs: (technologies) => dispatch(setTechs(technologies)),
     setShowJobDurationSlider: (val) => dispatch(setShowJobDurationSlider(val)),
+    setShowHidden: (val) => dispatch(setShowHidden(val)),
     resetAdvancedSearchFields: () => dispatch(resetAdvancedSearchFields()),
 });
 

diff --git a/src/components/HomePage/SearchArea/searchAreaStyle.js b/src/components/HomePage/SearchArea/searchAreaStyle.js
@@ -96,6 +96,5 @@ export default makeStyles((theme) => ({
     jobHiddenSliderToggle: {
         gridRowStart: 4,
         gridColumnStart: 2,
-
     },
 }));
diff --git a/src/reducers/searchOffersReducer.js b/src/reducers/searchOffersReducer.js
@@ -18,6 +18,7 @@ const initialState = {
     offers: [],
     loading: false,
     error: INITIAL_ERROR,
+    showHidden: false,
 };
 
 export default (state = initialState, action) => {
@@ -107,6 +108,11 @@ export default (state = initialState, action) => {
                     new Offer({ ...offer, isHidden: false, hiddenReason: null, adminReason: null })
                     : offer
                 ) };
+        case OfferSearchTypes.SET_SHOW_HIDDEN:
+            return {
+                ...state,
+                showHidden: action.showHidden,
+            };
         default:
             return state;
     }