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.

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

fix: no close search popup when redirecting to results page #819

Merged
merged 2 commits into from
Nov 26, 2024
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 RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
### Migliorie

- Rimossa dal CT Evento la data di scadenza del CT per evitare confusione con le date effettive dell'evento
- Durante la ricerca nel sito dalla popup che compare cliccando sul bottone 'Cerca' nella testa del sito, viene mostrato un loader in overlay durante il caricamento della pagina dei risultati perchè questo potrebbe richiedere un po' di tempo. Prima di questa modifica non era chiaro se la ricerca fosse iniziata.
- Nel CT Evento per una rassegna, se gli eventi figli hanno una ricorrenza o un periodo di date impostato, il range di date verrà mostrato nella card all'interno dell'evento padre.

### Novità
Expand Down
14 changes: 11 additions & 3 deletions src/components/ItaliaTheme/Header/HeaderSearch/SearchModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {
Input,
Label,
Toggle,
Spinner,
} from 'design-react-kit';

import { Icon } from 'design-comuni-plone-theme/components/ItaliaTheme';
Expand Down Expand Up @@ -173,6 +174,7 @@ const SearchModal = ({ closeModal, show }) => {
const dispatch = useDispatch();
const location = useLocation();

const [redirectingToResults, setRedirectingToResults] = useState(false);
const [advancedSearch, setAdvancedSearch] = useState(false);
const [advancedTab, setAdvancedTab] = useState(null);
const [searchableText, setSearchableText] = useState(
Expand Down Expand Up @@ -296,10 +298,11 @@ const SearchModal = ({ closeModal, show }) => {
setOptions((prevOptions) => ({ ...prevOptions, [optId]: value }));

const submitSearch = () => {
setRedirectingToResults(true);
setAdvancedSearch(false);
setTimeout(() => {
closeModal();
}, 500);
// setTimeout(() => {
// closeModal();
// }, 500);
};

const handleEnterSearch = (e) => {
Expand Down Expand Up @@ -923,6 +926,11 @@ const SearchModal = ({ closeModal, show }) => {
</div>
)}
</Container>
{redirectingToResults && (
<div className="overlay loading-results">
<Spinner active />
</div>
)}
</ModalBody>
</Modal>
);
Expand Down
13 changes: 13 additions & 0 deletions src/theme/extras/_modals.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,17 @@
.chip {
cursor: pointer;
}

.overlay.loading-results {
width: 100%;
height: 100%;
position: fixed;
z-index: 9999;
top: 0;
left: 0;
background-color: hsl(0deg 0% 100% / 64%);
deodorhunter marked this conversation as resolved.
Show resolved Hide resolved
display: flex;
align-items: center;
justify-content: center;
}
}
Loading