Fjerne mulighet for å registrere formidling i jobbmesse (#263)

navikt · Dec 17, 2024 · 3696d5a · 3696d5a
1 parent 4ab6b1d
commit 3696d5a
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 13 deletions.
diff --git 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
@@ -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<Props> = ({
         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
@@ -273,6 +273,7 @@ const Stilling = () => {
                         stillingId={stilling.uuid}
                         erEier={erEier}
                         erFormidling={erFormidling}
+                        erJobbmesse={erJobbmesse}
                         source={stilling.source}
                     />
                 </div>

diff --git 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<IStillingKandidatKnapper> = ({
     stillingId,
     erEier,
     erFormidling,
+    erJobbmesse,
     source,
 }) => {
     const [visLeggTilKandidatModal, setVisLeggTilKandidatModal] = React.useState<boolean>(false);
@@ -92,13 +94,15 @@ const StillingKandidatKnapper: React.FC<IStillingKandidatKnapper> = ({
                     </Button>
                 </TilgangskontrollForInnhold>
 
-                <LeggTilKandidatModal
-                    erEier={erEier}
-                    vis={visLeggTilKandidatModal}
-                    onClose={() => setVisLeggTilKandidatModal(false)}
-                    //@ts-ignore TODO: written before strict-mode enabled
-                    stillingsId={stillingId}
-                />
+                {stillingId && (
+                    <LeggTilKandidatModal
+                        erEier={erEier}
+                        vis={visLeggTilKandidatModal}
+                        onClose={() => setVisLeggTilKandidatModal(false)}
+                        erJobbmesse={erJobbmesse}
+                        stillingsId={stillingId}
+                    />
+                )}
                 <AnalyserStillingModal
                     vis={visAnalyserStillingModal}
                     onClose={() => setVisAnalyserStillingModal(false)}

diff --git a/src/stilling/stilling/legg-til-kandidat/LeggTilKandidat.tsx b/src/stilling/stilling/legg-til-kandidat/LeggTilKandidat.tsx
@@ -17,13 +17,15 @@ type ILeggTilKandidat = {
     kandidatlisteId: string;
     stillingsId: string;
     erEier?: boolean;
+    erJobbmesse?: boolean;
 };
 
 const LeggTilKandidat: FunctionComponent<ILeggTilKandidat> = ({
     kandidatlisteId,
     onClose,
     erEier,
     stillingsId,
+    erJobbmesse,
 }) => {
     const [visOppsummering, setVisOppsummering] = useState<boolean>(false);
     const [visSynlighetsEvaluering, setVisSynlighetsEvaluering] = useState<boolean>(false);
@@ -103,7 +105,9 @@ const LeggTilKandidat: FunctionComponent<ILeggTilKandidat> = ({
                                 onAvbryt={onClose}
                                 onBekreft={handleBekreft}
                                 setRegistrerFormidling={
-                                    erEier ? () => setRegistrerFormidling(true) : undefined
+                                    !erJobbmesse && erEier
+                                        ? () => setRegistrerFormidling(true)
+                                        : undefined
                                 }
                             />
                         ))}
@@ -174,7 +178,7 @@ const LeggTilKandidat: FunctionComponent<ILeggTilKandidat> = ({
                                     )}
                                     <br />
 
-                                    {erEier && (
+                                    {!erJobbmesse && erEier && (
                                         <Button
                                             onClick={() => setRegistrerFormidling(true)}
                                             style={{ width: '100%', marginBottom: '1rem' }}

diff --git a/src/stilling/stilling/legg-til-kandidat/LeggTilKandidatModal.tsx b/src/stilling/stilling/legg-til-kandidat/LeggTilKandidatModal.tsx
@@ -9,13 +9,15 @@ type ILeggTilKandidatModal = {
     onClose: () => void;
     stillingsId: string;
     erEier?: boolean;
+    erJobbmesse?: boolean;
 };
 
 const LeggTilKandidatModal: React.FC<ILeggTilKandidatModal> = ({
     vis,
     onClose,
     stillingsId,
     erEier,
+    erJobbmesse,
 }) => {
     const { kandidatlisteId, isLoading, isError } = useKandidatlisteId(stillingsId);
     return (
@@ -39,6 +41,7 @@ const LeggTilKandidatModal: React.FC<ILeggTilKandidatModal> = ({
                     onClose={onClose}
                     erEier={erEier}
                     stillingsId={stillingsId}
+                    erJobbmesse={erJobbmesse}
                 />
             )}
         </Modal>