Skip to content

Commit cca6380

Browse files
LudvigHzLudvigHz
committed
Formater alt med prettier
1 parent 2e28d01 commit cca6380

33 files changed

+223
-201
lines changed

‎.github/dependabot.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
version: 2
22
updates:
3-
- package-ecosystem: "npm"
4-
directory: "/"
3+
- package-ecosystem: 'npm'
4+
directory: '/'
55
schedule:
6-
interval: "daily"
6+
interval: 'daily'
77
open-pull-requests-limit: 20
88
groups:
99
navikt-aksel:

‎.github/workflows/main-v3.yaml

+12-12
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,20 @@ jobs:
3737
if: github.ref == 'refs/heads/dev'
3838
uses: nais/deploy/actions/cdn-upload/v2@master
3939
with:
40-
team: personoversikt
41-
source: ./packages/internarbeidsflate-decorator-v3/dist/
42-
destination: /internarbeidsflate-decorator-v3/dev/latest
43-
no_cache_paths: "internarbeidsflate-decorator-v3/dev/latest/dist/asset-manifest.json,internarbeidsflate-decorator-v3/dev/latest/dist/bundle.js,internarbeidsflate-decorator-v3/dev/latest/dist/index.css"
44-
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
45-
project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
40+
team: personoversikt
41+
source: ./packages/internarbeidsflate-decorator-v3/dist/
42+
destination: /internarbeidsflate-decorator-v3/dev/latest
43+
no_cache_paths: 'internarbeidsflate-decorator-v3/dev/latest/dist/asset-manifest.json,internarbeidsflate-decorator-v3/dev/latest/dist/bundle.js,internarbeidsflate-decorator-v3/dev/latest/dist/index.css'
44+
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
45+
project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
4646

4747
- name: Upload to CDN prod path
4848
if: github.ref == 'refs/heads/master'
4949
uses: nais/deploy/actions/cdn-upload/v2@master
5050
with:
51-
team: personoversikt
52-
source: ./packages/internarbeidsflate-decorator-v3/dist/
53-
destination: /internarbeidsflate-decorator-v3/prod/latest
54-
no_cache_paths: "internarbeidsflate-decorator-v3/prod/latest/dist/asset-manifest.json,internarbeidsflate-decorator-v3/prod/latest/dist/bundle.js,internarbeidsflate-decorator-v3/prod/latest/dist/index.css"
55-
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
56-
project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
51+
team: personoversikt
52+
source: ./packages/internarbeidsflate-decorator-v3/dist/
53+
destination: /internarbeidsflate-decorator-v3/prod/latest
54+
no_cache_paths: 'internarbeidsflate-decorator-v3/prod/latest/dist/asset-manifest.json,internarbeidsflate-decorator-v3/prod/latest/dist/bundle.js,internarbeidsflate-decorator-v3/prod/latest/dist/index.css'
55+
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
56+
project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}

‎.prettierrc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"tabWidth": 2,
33
"singleQuote": true
4-
}
4+
}

‎bun.lockb

1.55 KB
Binary file not shown.

‎eslint.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import eslint from '@eslint/js';
22
import tseslint from 'typescript-eslint';
3-
import prettier from 'eslint-config-prettier';
3+
import prettier from 'eslint-plugin-prettier/recommended';
44

55
export default tseslint.config(
66
eslint.configs.recommended,
7-
prettier,
87
...tseslint.configs.recommendedTypeChecked,
98
{
109
ignores: ['**/dist/**/*'],
@@ -31,4 +30,5 @@ export default tseslint.config(
3130
{
3231
ignores: ['**/postcss.config.cjs'],
3332
},
33+
prettier,
3434
);

‎package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
],
99
"scripts": {
1010
"clean": "rm -rf node_modules packages/dev-server/node_modules packages/internarbeidsflate-decorator-v3/node_modules bun.lockb packages/dev-server/bun.lockb packages/internarbeidsflate-decorator-v3/bun.lockb",
11-
"lint": "eslint"
11+
"lint": "eslint",
12+
"format": "prettier . --write"
1213
},
1314
"devDependencies": {
1415
"@eslint/js": "^9.2.0",

‎packages/dev-server/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
"peerDependencies": {
1515
"typescript": "^5.0.0"
1616
}
17-
}
17+
}

‎packages/dev-server/tsconfig.json

+2-4
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
"allowJs": true,
1818
"types": [
1919
"bun-types" // add Bun global
20-
],
20+
]
2121
},
22-
"references": [
23-
{ "path": "../../tsconfig.json" }
24-
]
22+
"references": [{ "path": "../../tsconfig.json" }]
2523
}

‎packages/internarbeidsflate-decorator-v3/postcss.config.cjs

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
module.exports = () => ({
2-
plugins: [
3-
require('tailwindcss')(),
4-
require('autoprefixer')()
5-
]
6-
})
2+
plugins: [require('tailwindcss')(), require('autoprefixer')()],
3+
});

‎packages/internarbeidsflate-decorator-v3/src/__mocks__/mock-error-config.ts

+27-27
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
export interface FailureConfig {
2-
meEndpoint: boolean;
3-
aktorIdEndpoint: boolean;
4-
enhetEndpoint: boolean;
5-
websocketConnection: boolean;
6-
contextholder: {
7-
updateEnhet: boolean;
8-
updateBruker: boolean;
9-
deleteEnhet: boolean;
10-
deleteBruker: boolean;
11-
getEnhet: boolean;
12-
getBruker: boolean;
13-
get: boolean;
14-
};
2+
meEndpoint: boolean;
3+
aktorIdEndpoint: boolean;
4+
enhetEndpoint: boolean;
5+
websocketConnection: boolean;
6+
contextholder: {
7+
updateEnhet: boolean;
8+
updateBruker: boolean;
9+
deleteEnhet: boolean;
10+
deleteBruker: boolean;
11+
getEnhet: boolean;
12+
getBruker: boolean;
13+
get: boolean;
14+
};
1515
}
1616

1717
const config: FailureConfig = {
18-
meEndpoint: false,
19-
aktorIdEndpoint: false,
20-
enhetEndpoint: false,
21-
websocketConnection: false,
22-
contextholder: {
23-
updateEnhet: false,
24-
updateBruker: false,
25-
deleteEnhet: false,
26-
deleteBruker: false,
27-
getEnhet: false,
28-
getBruker: false,
29-
get: false
30-
}
18+
meEndpoint: false,
19+
aktorIdEndpoint: false,
20+
enhetEndpoint: false,
21+
websocketConnection: false,
22+
contextholder: {
23+
updateEnhet: false,
24+
updateBruker: false,
25+
deleteEnhet: false,
26+
deleteBruker: false,
27+
getEnhet: false,
28+
getBruker: false,
29+
get: false,
30+
},
3131
};
3232

33-
export default config;
33+
export default config;

‎packages/internarbeidsflate-decorator-v3/src/api/WebSocketWrapper.ts

+10-4
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,18 @@ export class WebSocketWrapper {
3434
#status: Status;
3535
#wsUrl: string;
3636
readonly #listener: WebSocketListener;
37-
#environment: Environment
37+
#environment: Environment;
3838

3939
private connection?: WebSocket;
4040
private resettimer?: ReturnType<typeof window.setTimeout> | null;
4141
private retrytimer?: ReturnType<typeof window.setTimeout> | null;
4242
private retryCounter = 0;
4343

44-
constructor(wsUrl: string, environment: Environment, listener: WebSocketListener) {
44+
constructor(
45+
wsUrl: string,
46+
environment: Environment,
47+
listener: WebSocketListener,
48+
) {
4549
this.#wsUrl = wsUrl;
4650
this.#listener = listener;
4751
this.#environment = environment;
@@ -55,8 +59,10 @@ export class WebSocketWrapper {
5559
}
5660
WebSocketWrapper.#print('Opening WS', this.#wsUrl);
5761
if (this.#environment === 'mock') {
58-
console.warn('WebSocket er ikke støttet av MSW ennå, derfor blir det ikke mocket. Se: https://github.com/mswjs/msw/issues/156')
59-
return
62+
console.warn(
63+
'WebSocket er ikke støttet av MSW ennå, derfor blir det ikke mocket. Se: https://github.com/mswjs/msw/issues/156',
64+
);
65+
return;
6066
}
6167
this.connection = new WebSocket(this.#wsUrl);
6268
this.connection.addEventListener('open', this.#onWSOpen);

‎packages/internarbeidsflate-decorator-v3/src/components/AppName.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ const AppName: React.FC = () => {
99
<div className="dr-w-14 dr-border-solid dr-border-r dr-border-gray-200 dr-pr-2">
1010
<NAVLogo />
1111
</div>
12-
<div className="dr-min-w-[7.75rem] dr-max-w-[16rem] dr-pl-2">{appName}</div>
12+
<div className="dr-min-w-[7.75rem] dr-max-w-[16rem] dr-pl-2">
13+
{appName}
14+
</div>
1315
</div>
1416
);
1517
};

‎packages/internarbeidsflate-decorator-v3/src/components/Banner.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ const Banner: React.FC = () => {
1717
<div className="dr-max-w-full dr-mx-auto">
1818
<div className="dr-flex dr-flex-wrap dr-items-center dr-justify-evenly dr-gap-1">
1919
<AppName />
20-
<div
21-
className="dr-flex dr-flex-wrap dr-flex-1 dr-gap-4 xl:dr-gap-8 dr-w-full dr-justify-center dr-items-center">
20+
<div className="dr-flex dr-flex-wrap dr-flex-1 dr-gap-4 xl:dr-gap-8 dr-w-full dr-justify-center dr-items-center">
2221
<Enhet />
2322
<EnhetVelger />
2423
<SearchArea />

‎packages/internarbeidsflate-decorator-v3/src/components/Enhet.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import { useAppState } from '../states/AppState';
44

55
const Enhet: React.FC = () => {
66
const enhet = StoreHandler.store((state) => state.enhet?.display);
7-
const enheter = StoreHandler.store((state) => state.veileder?.enheter)
8-
const showEnheter = useAppState((state) => state.showEnheter)
7+
const enheter = StoreHandler.store((state) => state.veileder?.enheter);
8+
const showEnheter = useAppState((state) => state.showEnheter);
99

1010
if ((enheter && enheter.length > 1) || !showEnheter) {
11-
return null
11+
return null;
1212
}
1313

1414
return (

‎packages/internarbeidsflate-decorator-v3/src/components/EnhetVelger.tsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,13 @@ const EnhetVelger: React.FC = () => {
3333

3434
const onChange = (e: ChangeEvent<HTMLSelectElement>) => {
3535
if (!enheter) {
36-
throw new Error("Hadde ingen enheter når veileder prøvde å endre enhet")
36+
throw new Error('Hadde ingen enheter når veileder prøvde å endre enhet');
3737
}
3838
const value = e.currentTarget.value;
39-
StoreHandler.enhetValueManager.changeEnhetLocallyAndExternally(enheter, value);
39+
StoreHandler.enhetValueManager.changeEnhetLocallyAndExternally(
40+
enheter,
41+
value,
42+
);
4043
};
4144

4245
if (!options.length || enheter?.length === 1) return null;

‎packages/internarbeidsflate-decorator-v3/src/components/ErrorMessageDisplay.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ const ErrorMessageDisplay: React.FC<{ errorMessages: ErrorMessage[] }> = ({
1414
{`${firstMessage.code}: ${firstMessage.message}`}
1515
<Button
1616
variant="tertiary-neutral"
17-
size='small'
18-
className='!dr-ml-2 !dr-text-white hover:!dr-text-white hover:!dr-bg-red-700 focus:!dr-outline-none focus:!dr-ring focus:!dr-ring-white active:!dr-bg-red-600'
17+
size="small"
18+
className="!dr-ml-2 !dr-text-white hover:!dr-text-white hover:!dr-bg-red-700 focus:!dr-outline-none focus:!dr-ring focus:!dr-ring-white active:!dr-bg-red-600"
1919
onClick={() =>
2020
StoreHandler.errorManager.removeErrorMessage(firstMessage.code)
2121
}
2222
>
2323
Fjern
2424
</Button>
25-
</ErrorMessageContainer >
25+
</ErrorMessageContainer>
2626
);
2727
}
2828

‎packages/internarbeidsflate-decorator-v3/src/components/modals/HotkeyModal.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const HotkeyModal: React.FC<Props> = ({ hotkeys, open, close }) => {
1313
<Modal
1414
open={open}
1515
onClose={close}
16-
className='!dr-text-gray-900'
16+
className="!dr-text-gray-900"
1717
header={{ heading: 'Hurtigtaster', closeButton: true }}
1818
>
1919
<Modal.Body>

‎packages/internarbeidsflate-decorator-v3/src/index.css

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
@import "tailwindcss/base";
2-
@import "@navikt/ds-css";
3-
@import "tailwindcss/components";
4-
@import "tailwindcss/utilities";
1+
@import 'tailwindcss/base';
2+
@import '@navikt/ds-css';
3+
@import 'tailwindcss/components';
4+
@import 'tailwindcss/utilities';
55

66
.dekorator .navds-form-field {
77
display: block !important;
@@ -23,31 +23,31 @@
2323

2424
.dekorator .navds-text-field__input:hover {
2525
outline: 2px solid var(--a-orange-500);
26-
border: 1px solid transparent;
26+
border: 1px solid transparent;
2727
}
2828

2929
.dekorator .navds-select__input:focus-visible {
3030
outline: 2px solid var(--a-orange-500);
3131
}
3232
.dekorator .navds-select__input:hover {
3333
outline: 2px solid var(--a-orange-500);
34-
border: 1px solid transparent;
34+
border: 1px solid transparent;
3535
}
3636

3737
.dekorator .navds-button--tertiary-neutral:hover {
38-
color: var(--a-gray-900)
38+
color: var(--a-gray-900);
3939
}
4040

4141
.dekorator .navds-button--tertiary-neutral:active {
42-
color: #fff
42+
color: #fff;
4343
}
4444

45-
[data-theme="internarbeidsflatedecorator-theme"]{
45+
[data-theme='internarbeidsflatedecorator-theme'] {
4646
--ac-textfield-bg: var(--a-gray-900);
4747
--ac-select-bg: var(--a-gray-900);
4848
--ac-textfield-text: #fff;
4949
--ac-select-text: #fff;
5050
--a-text-default: #fff;
51-
--ac-textfield-placeholder: var(--a-gray-500);
52-
--ac-button-tertiary-neutral-text: var(--a-gray-900)
53-
}
51+
--ac-textfield-placeholder: var(--a-gray-500);
52+
--ac-button-tertiary-neutral-text: var(--a-gray-900);
53+
}

‎packages/internarbeidsflate-decorator-v3/src/states/HotkeyState.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { InternalHotkey, Hotkey, HotkeyObject } from '../types/Hotkey';
33

44
export const useHotkeyState = create<HotkeyState>((set) => {
55
let internalHotkeys: Record<string, InternalHotkey> = {};
6-
6+
77
const register = (isDefaultKey: boolean = false, ...hotkeys: Hotkey[]) => {
88
for (const hotkey of hotkeys) {
99
const hotkeyDescription = getHotkeyDescription(hotkey.key);

‎packages/internarbeidsflate-decorator-v3/src/store/ContextValueManager.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export class ContextValueManager extends SubstateHandler {
1515
) => {
1616
const currentValue = { ...this.state[key] };
1717
const newValue = { ...currentValue, ...update };
18-
18+
1919
this.setState({ [key]: newValue });
2020
};
2121

0 commit comments

Comments
 (0)