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

fjern storage av markerteKandidater #264

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
deploy-til-dev:
name: Deploy til dev-gcp
needs: bygg-og-push-docker-image
if: github.event_name == 'workflow_dispatch' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/formidling-jobbmesse'
if: github.event_name == 'workflow_dispatch' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/markerteKandidater'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
1 change: 0 additions & 1 deletion src/kandidatsok/KandidatSøkContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import { lesSessionStorage, skrivSessionStorage } from './sessionStorage';
export type Økt = Partial<{
searchParams: string;
sistBesøkteKandidat: string;
markerteKandidater: string[];
navigerbareKandidater: string[];
totaltAntallKandidater: number;
pageSize: number;
Expand Down
24 changes: 3 additions & 21 deletions src/kandidatsok/Kandidatsøk.tsx
Original file line number Diff line number Diff line change
@@ -1,41 +1,23 @@
import { useContext, useEffect } from 'react';
import { useSearchParams } from 'react-router-dom';
import Piktogram from 'felles/komponenter/piktogrammer/finn-kandidater.svg';
import { KandidatsokQueryParam } from 'felles/lenker';
import { useSearchParams } from 'react-router-dom';
import Layout from '../felles/komponenter/layout/Layout';
import { KandidatSøkContext } from './KandidatSøkContext';
import css from './Kandidatsøk.module.css';
import Filter from './filter/Filter';
import TømFiltre from './filter/TømFiltre';
import PorteføljeTabs from './filter/porteføljetabs/PorteføljeTabs';
import useLagreØkt from './hooks/useLagreØkt';
import useMarkerteKandidater from './hooks/useMarkerteKandidater';
import useNavigeringsstate from './hooks/useNavigeringsstate';
import Kandidater from './kandidater/Kandidater';
import Kandidatlistebanner from './kandidatlistebanner/Kandidatlistebanner';
import { KandidatsokQueryParam } from 'felles/lenker';

const Kandidatsøk = () => {
const navigeringsstate = useNavigeringsstate();
const [searchParams] = useSearchParams();
const stillingId = searchParams.get(KandidatsokQueryParam.Stilling);
const { kandidatSøkØkt } = useContext(KandidatSøkContext);

const forrigeØkt =
navigeringsstate.brukKriterierFraStillingen || navigeringsstate.fraMeny
? null
: kandidatSøkØkt?.forrigeØkt;

const { markerteKandidater, onMarkerKandidat, fjernMarkering } = useMarkerteKandidater(
forrigeØkt?.markerteKandidater
);
const { markerteKandidater, onMarkerKandidat, fjernMarkering } = useMarkerteKandidater();

useLagreØkt();
useEffect(() => {
kandidatSøkØkt?.setØkt &&
kandidatSøkØkt.setØkt({
markerteKandidater: Array.from(markerteKandidater),
});
}, [markerteKandidater, kandidatSøkØkt]);

return (
<Layout
Expand Down
20 changes: 4 additions & 16 deletions src/kandidatsok/sessionStorage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,14 @@ export const lesSessionStorage = (sessionStorageKey: string): Økt => {
const session = window.sessionStorage.getItem(sessionStorageKey);

if (session) {
const { markerteKandidater, ...verdier } = JSON.parse(session);
const verdier = JSON.parse(session);

return {
...verdier,
markerteKandidater: new Set(markerteKandidater),
};
return verdier;
} else {
return {};
}
};

export const skrivSessionStorage = (
sessionStorageKey: string,
{ markerteKandidater, ...verdier }: Økt
) => {
window.sessionStorage.setItem(
sessionStorageKey,
JSON.stringify({
...verdier,
markerteKandidater: Array.from(markerteKandidater || []),
})
);
export const skrivSessionStorage = (sessionStorageKey: string, verdier: Økt) => {
window.sessionStorage.setItem(sessionStorageKey, JSON.stringify(verdier));
};
Loading