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

Lenkeløs sak med neste steg #1831

Merged
merged 4 commits into from
May 29, 2024
Merged
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
6 changes: 2 additions & 4 deletions src/Pages/Saksoversikt/SakPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ export const SakPanel = ({
apen={tidslinjeOpen}
antall={tidslinje.length}
tidslinjeOpen={tidslinjeOpen}
nesteSteg={nesteStegTekst}
/>
))}
</div>
Expand Down Expand Up @@ -128,7 +127,7 @@ const NesteSteg = ({ nesteStegTekst, tidslinjeLengde, apen }: NesteStegProps) =>
<NesteStegIkon title="Neste steg" />
</div>
<div style={{ gridArea: 'linje', marginLeft: '1px' }}>
{apen && tidslinjeLengde > 0 ? <TidslinjeLinjeIkon stiplet height={24} /> : null}
{tidslinjeLengde > 0 ? <TidslinjeLinjeIkon stiplet height={24} /> : null}
</div>
<BodyShort style={{ gridArea: 'tittel' }}>{nesteStegTekst}</BodyShort>
</div>
Expand Down Expand Up @@ -156,9 +155,8 @@ const Tidslinjeelement = ({
apen,
antall,
tidslinjeOpen,
nesteSteg,
}: TidslinjeelementHelperProps) => {
if (!apen && (indeks > 0 || nesteSteg !== undefined)) return null;
if (!apen && indeks > 0) return null;
if (tidslinjeelement.__typename === 'BeskjedTidslinjeElement') {
return (
<BeskjedElement
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/Saksoversikt/Saksfilter/Saksfilter.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { FC, useContext, useEffect, useState } from 'react';
import React, { FC, useContext, useEffect, useRef, useState } from 'react';
import './Saksfilter.css';
import { Virksomhetsmeny } from './Virksomhetsmeny/Virksomhetsmeny';
import { Søkeboks } from './Søkeboks';
Expand Down
2 changes: 2 additions & 0 deletions src/Pages/Saksoversikt/Saksside.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ const HENT_SAK_ID: TypedDocumentNode<SakQueryResponse> = gql`
sisteStatus {
tidspunkt
}
nesteSteg
tidslinje {
... on OppgaveTidslinjeElement {
id
Expand Down Expand Up @@ -85,6 +86,7 @@ const HENT_SAK_GRUPPERINGSID: TypedDocumentNode<SakQueryResponse> = gql`
sisteStatus {
tidspunkt
}
nesteSteg
tidslinje {
... on OppgaveTidslinjeElement {
id
Expand Down
Loading