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.

Sign up for GitHub

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

Jump to bottom

Fjerne fuzzy-gate #245

Merged
merged 1 commit into from
Oct 11, 2024
Merged

Fjerne fuzzy-gate #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
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/decorator-url'
if: github.event_name == 'workflow_dispatch' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/fjerne-filterOrd'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
173 changes: 0 additions & 173 deletions src/felles/filterOrd.ts
View file
Open in desktop

This file was deleted.

7 changes: 2 additions & 5 deletions src/formidling/Formidlingssøk.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Heading, Loader } from '@navikt/ds-react';
import * as React from 'react';
import { Stillingskategori } from '../felles/domene/stilling/Stilling';
import { filtrerOrdFraStilling } from '../felles/filterOrd';
import { formaterAntallAnnonser } from '../stilling/stillingssok/Stillingssøk';
import { GlobalAggregering } from '../stilling/stillingssok/domene/elasticSearchTyper';
import Filtermeny from '../stilling/stillingssok/filter/filtermeny/Filtermeny';
Expand Down Expand Up @@ -32,9 +31,7 @@ const Formidlingssøk: React.FC<IAlleFormidlinger> = ({ navIdent }) => {
const globalAggregering = respons?.aggregations
?.globalAggregering as unknown as GlobalAggregering;

const filtrertResultat = filtrerOrdFraStilling(respons?.hits?.hits);

const antallTreff = useAntallTreff(respons) - filtrertResultat.antallFiltrertBort;
const antallTreff = useAntallTreff(respons);

if (!respons) {
return (
Expand All @@ -53,7 +50,7 @@ const Formidlingssøk: React.FC<IAlleFormidlinger> = ({ navIdent }) => {
<Søkefelter aggregeringer={globalAggregering?.felter?.buckets} />
<Sorter />
</div>
<Stillingsliste hits={filtrertResultat.hits} />
<Stillingsliste hits={respons?.hits?.hits} />
<div style={{ display: 'flex', justifyContent: 'center' }}>
<Paginering totaltAntallTreff={antallTreff} />
</div>
Expand Down
7 changes: 2 additions & 5 deletions src/stilling/stillingssok/AlleStillinger.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Heading, Loader } from '@navikt/ds-react';
import { Stillingskategori } from 'felles/domene/stilling/Stilling';
import { filtrerOrdFraStilling } from '../../felles/filterOrd';
import { formaterAntallAnnonser } from './Stillingssøk';
import css from './Stillingssøk.module.css';
import { GlobalAggregering } from './domene/elasticSearchTyper';
Expand Down Expand Up @@ -30,9 +29,7 @@ const AlleStillinger = ({ kandidatnr, finnerStillingForKandidat }: Props) => {
const globalAggregering = respons?.aggregations
?.globalAggregering as unknown as GlobalAggregering;

const filtrertResultat = filtrerOrdFraStilling(respons?.hits?.hits);

const antallTreff = useAntallTreff(respons) - filtrertResultat.antallFiltrertBort;
const antallTreff = useAntallTreff(respons);

if (!respons) {
return (
Expand All @@ -51,7 +48,7 @@ const AlleStillinger = ({ kandidatnr, finnerStillingForKandidat }: Props) => {
<Søkefelter aggregeringer={globalAggregering?.felter?.buckets} />
<Sorter />
</div>
<Stillingsliste hits={filtrertResultat.hits} kandidatnr={kandidatnr} />
<Stillingsliste hits={respons?.hits?.hits} kandidatnr={kandidatnr} />
<div style={{ display: 'flex', justifyContent: 'center' }}>
<Paginering totaltAntallTreff={antallTreff} />
</div>
Expand Down
7 changes: 2 additions & 5 deletions src/stilling/stillingssok/MineStillinger.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Heading, Loader } from '@navikt/ds-react';
import { filtrerOrdFraStilling } from '../../felles/filterOrd';
import { fallbackIngenValgteStillingskategorierSet } from './AlleStillinger';
import { formaterAntallAnnonser } from './Stillingssøk';
import css from './Stillingssøk.module.css';
Expand Down Expand Up @@ -27,9 +26,7 @@ const MineStillinger = ({ navIdent, kandidatnr, finnerStillingForKandidat }: Pro
const globalAggregering = respons?.aggregations
?.globalAggregering as unknown as GlobalAggregering;

const filtrertResultat = filtrerOrdFraStilling(respons?.hits?.hits);

const antallTreff = useAntallTreff(respons) - filtrertResultat.antallFiltrertBort;
const antallTreff = useAntallTreff(respons);

if (!respons) {
return (
Expand All @@ -48,7 +45,7 @@ const MineStillinger = ({ navIdent, kandidatnr, finnerStillingForKandidat }: Pro
<Søkefelter aggregeringer={globalAggregering?.felter?.buckets} />
<Sorter />
</div>
<Stillingsliste hits={filtrertResultat.hits} kandidatnr={kandidatnr} />
<Stillingsliste hits={respons?.hits?.hits} kandidatnr={kandidatnr} />
<div style={{ display: 'flex', justifyContent: 'center' }}>
<Paginering totaltAntallTreff={antallTreff} />
</div>
Expand Down
Loading