Fjern antall stillinger for jobbmesse (#261)

navikt · Dec 3, 2024 · 4ab6b1d · 4ab6b1d
1 parent e968a41
commit 4ab6b1d
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 22 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/legger-til-ferdigstilt-hendelse-varsling'
+        if: github.event_name == 'workflow_dispatch' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/jobbmesse-antall'
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v3

diff --git a/src/stilling/stilling/Stilling.tsx b/src/stilling/stilling/Stilling.tsx
@@ -56,6 +56,7 @@ const Stilling = () => {
     const stillingsinfo = useSelector((state: State) => state.stillingsinfoData);
 
     const erFormidling = stillingsinfo.stillingskategori === Stillingskategori.Formidling;
+    const erJobbmesse = stillingsinfo.stillingskategori === Stillingskategori.Jobbmesse;
 
     const { kandidatlisteId, mutate } = useKandidatlisteId(uuid);
 
@@ -185,6 +186,7 @@ const Stilling = () => {
                                 ) : (
                                     <Edit
                                         erFormidling={erFormidling}
+                                        erJobbmesse={erJobbmesse}
                                         innloggetBruker={navIdent}
                                         onPreviewAdClick={onPreviewAdClick}
                                     />

diff --git a/src/stilling/stilling/adValidationReducer.ts b/src/stilling/stilling/adValidationReducer.ts
@@ -1,4 +1,4 @@
-import { Privacy } from 'felles/domene/stilling/Stilling';
+import { Privacy, Stillingskategori } from 'felles/domene/stilling/Stilling';
 import moment from 'moment';
 import { put, select, takeLatest } from 'redux-saga/effects';
 import { State } from '../redux/store';
@@ -400,16 +400,17 @@ function* validateEngagementType(): Generator<unknown, any, any> {
 function* validatePositionCount() {
     const state: State = yield select();
     const positioncount = state.adData?.properties.positioncount;
-
     const error = positioncount && !positioncount.match(/^[1-9]\d*$/);
 
-    if (valueIsNotSet(positioncount) || error) {
-        yield addValidationError({
-            field: 'positioncount',
-            message: 'Antall stillinger mangler',
-        });
-    } else {
-        yield removeValidationError({ field: 'positioncount' });
+    if (state.stillingsinfoData.stillingskategori !== Stillingskategori.Jobbmesse) {
+        if (valueIsNotSet(positioncount) || error) {
+            yield addValidationError({
+                field: 'positioncount',
+                message: 'Antall stillinger mangler',
+            });
+        } else {
+            yield removeValidationError({ field: 'positioncount' });
+        }
     }
 }
 

diff --git a/src/stilling/stilling/edit/Edit.tsx b/src/stilling/stilling/edit/Edit.tsx
@@ -26,6 +26,7 @@ type Props = {
     resetValidation: () => void;
     stilling: Stilling;
     erFormidling: boolean;
+    erJobbmesse: boolean;
 };
 
 const Edit = ({
@@ -34,6 +35,7 @@ const Edit = ({
     onPreviewAdClick,
     resetValidation,
     erFormidling,
+    erJobbmesse,
 }: Props) => {
     const stillingenErEkstern = stilling.createdBy !== System.Rekrutteringsbistand;
 
@@ -78,7 +80,7 @@ const Edit = ({
                 </Accordion>
                 <Accordion className={classNames(css.høyre, css.accordions)}>
                     <Seksjon spacing tittel="Praktiske opplysninger">
-                        <PraktiskeOpplysninger />
+                        <PraktiskeOpplysninger erJobbmesse={erJobbmesse} />
                     </Seksjon>
                     <Seksjon spacing tittel="Kontaktinformasjon">
                         <Kontaktinformasjon innloggetBruker={innloggetBruker} />

diff --git a/src/stilling/stilling/edit/praktiske-opplysninger/PraktiskeOpplysninger.tsx b/src/stilling/stilling/edit/praktiske-opplysninger/PraktiskeOpplysninger.tsx
@@ -39,6 +39,7 @@ type Props = {
     setStartTime: (value?: string) => void;
     setApplicationDue: (value: string) => void;
     validation: Record<ValidertFelt, string | undefined>;
+    erJobbmesse: boolean;
 };
 
 class PraktiskeOpplysninger extends React.Component<Props> {
@@ -100,7 +101,7 @@ class PraktiskeOpplysninger extends React.Component<Props> {
     };
 
     render() {
-        const { ad, workday, workhours } = this.props;
+        const { ad, workday, workhours, erJobbmesse } = this.props;
 
         const workdayAsArray: string[] | undefined = workday
             ? isJson(workday)
@@ -175,16 +176,18 @@ class PraktiskeOpplysninger extends React.Component<Props> {
                     <Radio value="Ikke oppgitt">Ikke oppgitt</Radio>
                 </RadioGroup>
                 <div className={css.skillelinje} />
-                <div>
-                    <TextField
-                        label={<Skjemalabel påkrevd>Antall stillinger</Skjemalabel>}
-                        value={ad.properties.positioncount}
-                        onChange={this.onPositioncountChange}
-                        error={this.props.validation.positioncount}
-                        type="number"
-                        min="1"
-                    />
-                </div>
+                {!erJobbmesse && (
+                    <div>
+                        <TextField
+                            label={<Skjemalabel påkrevd>Antall stillinger</Skjemalabel>}
+                            value={ad.properties.positioncount}
+                            onChange={this.onPositioncountChange}
+                            error={this.props.validation.positioncount}
+                            type="number"
+                            min="1"
+                        />
+                    </div>
+                )}
                 <Fieldset
                     className={css.datepickerOgCheckbox}
                     legend={<Skjemalabel påkrevd>Søknadsfrist</Skjemalabel>}