Skip to content

Commit

Permalink
isLoading -> isPending i mutations (#3627)
Browse files Browse the repository at this point in the history
  • Loading branch information
vebnor authored Jan 29, 2025
1 parent ae3d14b commit 5a4c1a4
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 42 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ interface OwnProps {
}

const SlettKøModal = ({ lukk, id, køTittel }: OwnProps) => {
const { mutate, isLoading, isError } = useSlettKøMutation(lukk);
const { mutate, isPending, isError } = useSlettKøMutation(lukk);
return (
<Modal open onClose={lukk} portal>
<Modal.Body>
<Heading size="medium">Slett kø</Heading>
<BodyShort>{`Er du sikker på at du vil slette ${køTittel}?`}</BodyShort>
{isError && <ErrorMessage>Noe gikk galt ved oppretting av kø.</ErrorMessage>}
<div className="mt-8 flex gap-4">
<Button loading={isLoading} onClick={() => mutate(id)}>
<Button loading={isPending} onClick={() => mutate(id)}>
Slett
</Button>
<Button variant="secondary" type="button" onClick={lukk}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import SearchDropdownMedPredefinerteVerdier, {
import kodeverkTyper from 'kodeverk/kodeverkTyper';

const AksjonspunktVelger: FunctionComponent<
SearchDropdownPredefinerteVerdierProps & { skjulValgteVerdierUnderDropdown: boolean }
SearchDropdownPredefinerteVerdierProps & { skjulValgteVerdierUnderDropdown?: boolean }
> = ({ onChange, feltdefinisjon, oppgavefilter, error, skjulValgteVerdierUnderDropdown }) => {
const oppgavekoder = useKodeverk(kodeverkTyper.OPPGAVE_KODE);
const formaterteOppgavekoder = oppgavekoder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const LeggTilSaksbehandlerForm: FunctionComponent = () => {
isLoading: isLoadingSaksbehandlere,
isSuccess: isSuccessSaksbehandlere,
} = useHentSaksbehandlereAvdelingsleder();
const { mutate: leggTilSaksbehandler, isLoading: isLoadingLeggTil } = useLeggTilSaksbehandler();
const { mutate: leggTilSaksbehandler, isPending: isLoadingLeggTil } = useLeggTilSaksbehandler();

// eslint-disable-next-line @typescript-eslint/no-explicit-any
const addSaksbehandler = (epost: string, form: FormApi<any, Partial<any>>, meta: FieldMetaState<any>) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const SaksbehandlerInfo: FunctionComponent<OwnProps> = ({ saksbehandler }) => {
isLoading: isLoadingKøerV3,
isSuccess: isSuccessKøerV3,
} = useHentAndreSaksbehandleresKøer(saksbehandler.id);
const { mutate, isLoading: isLoadingSlett } = useSlettSaksbehandler();
const { mutate, isPending: isLoadingSlett } = useSlettSaksbehandler();
const slettSaksbehandler = () => mutate({ epost: saksbehandler.epost }, { onSuccess: lukkSlettModal });

return (
Expand Down
8 changes: 4 additions & 4 deletions src/client/app/filter/AntallOppgaver.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const AntallOppgaver = ({ setQueryError }: OwnProps) => {
const { oppgaveQuery } = useContext(FilterContext);

const [antallOppgaver, setAntallOppgaver] = useState('');
const { mutate, isLoading } = useMutation<string, unknown, { url: string; body: OppgaveQuery }>({
const { mutate, isPending } = useMutation<string, unknown, { url: string; body: OppgaveQuery }>({
onSuccess: (respons) => {
if (respons !== undefined) {
setAntallOppgaver(respons);
Expand All @@ -32,15 +32,15 @@ export const AntallOppgaver = ({ setQueryError }: OwnProps) => {
return (
<div className="flex flex-col m-auto">
<Label size="small">
Antall oppgaver: {isLoading ? <Skeleton className="inline-block w-12" /> : antallOppgaver}
Antall oppgaver: {isPending ? <Skeleton className="inline-block w-12" /> : antallOppgaver}
</Label>
<Button
variant="tertiary"
icon={<ArrowsCirclepathIcon aria-hidden />}
size="small"
onClick={hentOppgaver}
loading={isLoading}
disabled={isLoading}
loading={isPending}
disabled={isPending}
>
Oppdater antall
</Button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export interface SearchDropdownPredefinerteVerdierProps extends Partial<SearchWi
onChange: (values: string[]) => void;
oppgavefilter: FeltverdiOppgavefilter;
error?: string;
skjulValgteVerdierUnderDropdown: boolean;
skjulValgteVerdierUnderDropdown?: boolean;
}

const SearchDropdownMedPredefinerteVerdier = ({
Expand Down
4 changes: 0 additions & 4 deletions src/client/app/form/finalFields/CheckboxField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,5 @@ const CheckboxField: FunctionComponent<OwnProps> = ({ name, label, validate, rea
/>
);

CheckboxField.defaultProps = {
validate: null,
readOnly: false,
};

export default CheckboxField;
8 changes: 0 additions & 8 deletions src/client/app/form/finalFields/DatepickerField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,4 @@ const DatepickerField: FunctionComponent<OwnProps> = ({
/>
);

DatepickerField.defaultProps = {
label: '',
readOnly: false,
isEdited: false,
format: (value) => value,
parse: (value) => value,
};

export default DatepickerField;
9 changes: 0 additions & 9 deletions src/client/app/form/finalFields/RadioOption.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,6 @@ export const RadioOption: FunctionComponent<OwnProps> = ({
);
};

RadioOption.defaultProps = {
name: '',
className: '',
disabled: false,
groupDisabled: false,
onChange: () => undefined,
manualHideChildren: false,
};

RadioOption.displayName = 'RadioOption';

export default RadioOption;
4 changes: 0 additions & 4 deletions src/client/app/form/finalFields/ReadOnlyField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,5 @@ export const ReadOnlyField: FunctionComponent<OwnProps> = ({ label, input, isEdi
);
};

ReadOnlyField.defaultProps = {
label: undefined,
isEdited: false,
};

export default ReadOnlyField;
3 changes: 0 additions & 3 deletions src/client/app/form/finalFields/TextAreaField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ const TextAreaWithBadge: FunctionComponent<TextAreaWithBadgeProps & WrappedCompo
</div>
);

TextAreaWithBadge.defaultProps = {
badges: null,
};

const renderNavTextArea = renderNavField(injectIntl(TextAreaWithBadge));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const skalViseListe = (resultat) => {
const FagsakSearch: FunctionComponent<OwnProps> = ({ setOppgave, goToFagsak }) => {
const queryFraURL = queryString.parse(window.location?.search ? window.location.search : '');
const erSokViaQueryParams = queryFraURL.sok && !hasValidSaksnummerEllerJournalpostFormat(queryFraURL.sok);
const { data: resultat, mutate: sok, isSuccess, isLoading } = useSøk();
const { data: resultat, mutate: sok, isSuccess, isPending } = useSøk();
useEffect(() => {
if (erSokViaQueryParams) {
const paramToString = queryFraURL.sok.toString();
Expand All @@ -42,7 +42,7 @@ const FagsakSearch: FunctionComponent<OwnProps> = ({ setOppgave, goToFagsak }) =

return (
<div>
<SearchForm onSubmit={sok} searchStarted={isLoading} />
<SearchForm onSubmit={sok} searchStarted={isPending} />
{isSuccess && resultat && resultat.oppgaver.length === 0 && !resultat.ikkeTilgang && (
<BodyShort className={styles.label}>
<FormattedMessage id="FagsakSearch.ZeroSearchResults" />
Expand Down
4 changes: 2 additions & 2 deletions src/client/app/saksbehandler/sokeboks/Søkeboks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import { SøkResultat } from 'saksbehandler/sokeboks/SøkResultat';
import VerticalSpacer from 'sharedComponents/VerticalSpacer';

export function Søkeboks() {
const { isLoading, mutate: utførSøk, data, reset: nullstillSøk } = useSøkOppgaveV3();
const { isPending, mutate: utførSøk, data, reset: nullstillSøk } = useSøkOppgaveV3();

return (
<>
<SøkForm utførSøk={utførSøk} loading={isLoading} nullstillSøk={nullstillSøk} />
<SøkForm utførSøk={utførSøk} loading={isPending} nullstillSøk={nullstillSøk} />
<VerticalSpacer sixteenPx />
<SøkResultat oppgaver={data} />
</>
Expand Down

0 comments on commit 5a4c1a4

Please sign in to comment.