From 3696d5ad8826f5d55ce27866565b731d2cd42e3d Mon Sep 17 00:00:00 2001 From: Wiklem Date: Tue, 17 Dec 2024 11:26:20 +0100 Subject: [PATCH] =?UTF-8?q?Fjerne=20mulighet=20for=20=C3=A5=20registrere?= =?UTF-8?q?=20formidling=20i=20jobbmesse=20(#263)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 2 +- .../kandidatliste/knappe-rad/KnappeRad.tsx | 5 +++-- src/stilling/stilling/Stilling.tsx | 1 + .../stilling/StillingKandidatKnapper.tsx | 20 +++++++++++-------- .../legg-til-kandidat/LeggTilKandidat.tsx | 8 ++++++-- .../LeggTilKandidatModal.tsx | 3 +++ 6 files changed, 26 insertions(+), 13 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7b52cf6b..be72b953 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -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/jobbmesse-antall' + if: github.event_name == 'workflow_dispatch' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/formidling-jobbmesse' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/src/kandidat/kandidatliste/knappe-rad/KnappeRad.tsx b/src/kandidat/kandidatliste/knappe-rad/KnappeRad.tsx index a7b92feb..243b94eb 100644 --- a/src/kandidat/kandidatliste/knappe-rad/KnappeRad.tsx +++ b/src/kandidat/kandidatliste/knappe-rad/KnappeRad.tsx @@ -4,6 +4,8 @@ import Kandidatliste, { Kandidatlistestatus } from 'felles/domene/kandidatliste/ import { Stillingskategori } from 'felles/domene/stilling/Stilling'; import { FunctionComponent, ReactNode } from 'react'; import { useSmserForStilling } from '../../../api/kandidatvarsel-api/kandidatvarsel'; +import { Rolle } from '../../../felles/tilgangskontroll/Roller'; +import { TilgangskontrollForInnhold } from '../../../felles/tilgangskontroll/TilgangskontrollForInnhold'; import { erKobletTilArbeidsgiver, erKobletTilStilling, @@ -14,8 +16,6 @@ import MedPopover from '../med-popover/MedPopover'; import DelMedArbeidsgiverKnapp from './DelMedArbeidsgiverKnapp'; import css from './KnappeRad.module.css'; import ForespørselOmDelingAvCv from './forespørsel-om-deling-av-cv/ForespørselOmDelingAvCv'; -import { TilgangskontrollForInnhold } from '../../../felles/tilgangskontroll/TilgangskontrollForInnhold'; -import { Rolle } from '../../../felles/tilgangskontroll/Roller'; type Props = { kandidatliste: Kandidatliste; @@ -39,6 +39,7 @@ const KnappeRad: FunctionComponent = ({ erFormidling ? null : kandidatliste.stillingId || null ); const markerteKandidater = useMarkerteKandidater(kandidatliste.kandidater); + const minstEnKandidatErMarkert = markerteKandidater.length > 0; const markerteAktiveKandidater = markerteKandidater.filter((kandidat) => kandidat.fodselsnr); const kandidatvarselFeil = error !== undefined; diff --git a/src/stilling/stilling/Stilling.tsx b/src/stilling/stilling/Stilling.tsx index 9704bb9e..edca28ba 100644 --- a/src/stilling/stilling/Stilling.tsx +++ b/src/stilling/stilling/Stilling.tsx @@ -273,6 +273,7 @@ const Stilling = () => { stillingId={stilling.uuid} erEier={erEier} erFormidling={erFormidling} + erJobbmesse={erJobbmesse} source={stilling.source} /> diff --git a/src/stilling/stilling/StillingKandidatKnapper.tsx b/src/stilling/stilling/StillingKandidatKnapper.tsx index 7f2551a8..6e8df9c0 100644 --- a/src/stilling/stilling/StillingKandidatKnapper.tsx +++ b/src/stilling/stilling/StillingKandidatKnapper.tsx @@ -5,14 +5,15 @@ import { Link } from 'react-router-dom'; import { Rolle } from '../../felles/tilgangskontroll/Roller'; import { TilgangskontrollForInnhold } from '../../felles/tilgangskontroll/TilgangskontrollForInnhold'; import { lenkeTilFinnKandidater } from '../../kandidat/app/paths'; -import LeggTilKandidatModal from './legg-til-kandidat/LeggTilKandidatModal'; import AnalyserStillingModal from './analyse/AnalyserStillingModal'; +import LeggTilKandidatModal from './legg-til-kandidat/LeggTilKandidatModal'; export interface IStillingKandidatKnapper { kandidatlisteId: string; stillingId: string | null; erEier?: boolean; erFormidling?: boolean; + erJobbmesse?: boolean; source?: string; } @@ -21,6 +22,7 @@ const StillingKandidatKnapper: React.FC = ({ stillingId, erEier, erFormidling, + erJobbmesse, source, }) => { const [visLeggTilKandidatModal, setVisLeggTilKandidatModal] = React.useState(false); @@ -92,13 +94,15 @@ const StillingKandidatKnapper: React.FC = ({ - setVisLeggTilKandidatModal(false)} - //@ts-ignore TODO: written before strict-mode enabled - stillingsId={stillingId} - /> + {stillingId && ( + setVisLeggTilKandidatModal(false)} + erJobbmesse={erJobbmesse} + stillingsId={stillingId} + /> + )} setVisAnalyserStillingModal(false)} diff --git a/src/stilling/stilling/legg-til-kandidat/LeggTilKandidat.tsx b/src/stilling/stilling/legg-til-kandidat/LeggTilKandidat.tsx index 30ae6257..5b903252 100644 --- a/src/stilling/stilling/legg-til-kandidat/LeggTilKandidat.tsx +++ b/src/stilling/stilling/legg-til-kandidat/LeggTilKandidat.tsx @@ -17,6 +17,7 @@ type ILeggTilKandidat = { kandidatlisteId: string; stillingsId: string; erEier?: boolean; + erJobbmesse?: boolean; }; const LeggTilKandidat: FunctionComponent = ({ @@ -24,6 +25,7 @@ const LeggTilKandidat: FunctionComponent = ({ onClose, erEier, stillingsId, + erJobbmesse, }) => { const [visOppsummering, setVisOppsummering] = useState(false); const [visSynlighetsEvaluering, setVisSynlighetsEvaluering] = useState(false); @@ -103,7 +105,9 @@ const LeggTilKandidat: FunctionComponent = ({ onAvbryt={onClose} onBekreft={handleBekreft} setRegistrerFormidling={ - erEier ? () => setRegistrerFormidling(true) : undefined + !erJobbmesse && erEier + ? () => setRegistrerFormidling(true) + : undefined } /> ))} @@ -174,7 +178,7 @@ const LeggTilKandidat: FunctionComponent = ({ )}
- {erEier && ( + {!erJobbmesse && erEier && (