From f1cfd14c314751b8f3c964a924063e8e9d4983e3 Mon Sep 17 00:00:00 2001 From: Erling Hauan Date: Tue, 20 Aug 2024 09:06:01 +0200 Subject: [PATCH 1/6] Remove deprecated lines in pre-commit script. Test commit --- .husky/pre-commit | 3 --- .../StudioTableLocalPagination.tsx | 14 +++++++------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 5a182ef106d..37236231717 100644 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1 @@ -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" - yarn lint-staged diff --git a/frontend/libs/studio-components/src/components/StudioTableLocalPagination/StudioTableLocalPagination.tsx b/frontend/libs/studio-components/src/components/StudioTableLocalPagination/StudioTableLocalPagination.tsx index a4c04a93eb5..9ebeb71cf49 100644 --- a/frontend/libs/studio-components/src/components/StudioTableLocalPagination/StudioTableLocalPagination.tsx +++ b/frontend/libs/studio-components/src/components/StudioTableLocalPagination/StudioTableLocalPagination.tsx @@ -10,13 +10,13 @@ export type LocalPaginationProps = { }; export type StudioTableLocalPaginationProps = { - columns: Columns; - rows: Rows; - size?: 'small' | 'medium' | 'large'; - isLoading?: boolean; - loadingText?: string; - emptyTableFallback?: React.ReactNode; - pagination?: LocalPaginationProps; + // columns: Columns; + // rows: Rows; + // size?: 'small' | 'medium' | 'large'; + // isLoading?: boolean; + // loadingText?: string; + // emptyTableFallback?: React.ReactNode; + // pagination?: LocalPaginationProps; }; export const StudioTableLocalPagination = forwardRef< From 048b9a1493da5e004c5d824d18cdccd818a91776 Mon Sep 17 00:00:00 2001 From: Erling Hauan Date: Tue, 20 Aug 2024 09:08:48 +0200 Subject: [PATCH 2/6] Remove deprecated lines in pre-commit script --- .../StudioTableLocalPagination.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/libs/studio-components/src/components/StudioTableLocalPagination/StudioTableLocalPagination.tsx b/frontend/libs/studio-components/src/components/StudioTableLocalPagination/StudioTableLocalPagination.tsx index 9ebeb71cf49..a4c04a93eb5 100644 --- a/frontend/libs/studio-components/src/components/StudioTableLocalPagination/StudioTableLocalPagination.tsx +++ b/frontend/libs/studio-components/src/components/StudioTableLocalPagination/StudioTableLocalPagination.tsx @@ -10,13 +10,13 @@ export type LocalPaginationProps = { }; export type StudioTableLocalPaginationProps = { - // columns: Columns; - // rows: Rows; - // size?: 'small' | 'medium' | 'large'; - // isLoading?: boolean; - // loadingText?: string; - // emptyTableFallback?: React.ReactNode; - // pagination?: LocalPaginationProps; + columns: Columns; + rows: Rows; + size?: 'small' | 'medium' | 'large'; + isLoading?: boolean; + loadingText?: string; + emptyTableFallback?: React.ReactNode; + pagination?: LocalPaginationProps; }; export const StudioTableLocalPagination = forwardRef< From a70f22f53620136ad7ad6c6e9f74cbf855dfab0c Mon Sep 17 00:00:00 2001 From: Erling Hauan Date: Tue, 20 Aug 2024 09:12:46 +0200 Subject: [PATCH 3/6] Test commit --- .husky/pre-commit | 3 +++ .../StudioTableLocalPagination.tsx | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 37236231717..5a182ef106d 100644 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1 +1,4 @@ +#!/usr/bin/env sh +. "$(dirname -- "$0")/_/husky.sh" + yarn lint-staged diff --git a/frontend/libs/studio-components/src/components/StudioTableLocalPagination/StudioTableLocalPagination.tsx b/frontend/libs/studio-components/src/components/StudioTableLocalPagination/StudioTableLocalPagination.tsx index a4c04a93eb5..9ebeb71cf49 100644 --- a/frontend/libs/studio-components/src/components/StudioTableLocalPagination/StudioTableLocalPagination.tsx +++ b/frontend/libs/studio-components/src/components/StudioTableLocalPagination/StudioTableLocalPagination.tsx @@ -10,13 +10,13 @@ export type LocalPaginationProps = { }; export type StudioTableLocalPaginationProps = { - columns: Columns; - rows: Rows; - size?: 'small' | 'medium' | 'large'; - isLoading?: boolean; - loadingText?: string; - emptyTableFallback?: React.ReactNode; - pagination?: LocalPaginationProps; + // columns: Columns; + // rows: Rows; + // size?: 'small' | 'medium' | 'large'; + // isLoading?: boolean; + // loadingText?: string; + // emptyTableFallback?: React.ReactNode; + // pagination?: LocalPaginationProps; }; export const StudioTableLocalPagination = forwardRef< From ba8806acb553d9d91558b30a3422697515b30a9c Mon Sep 17 00:00:00 2001 From: Erling Hauan Date: Tue, 20 Aug 2024 09:14:05 +0200 Subject: [PATCH 4/6] Revert test changes --- .../StudioTableLocalPagination.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/libs/studio-components/src/components/StudioTableLocalPagination/StudioTableLocalPagination.tsx b/frontend/libs/studio-components/src/components/StudioTableLocalPagination/StudioTableLocalPagination.tsx index 9ebeb71cf49..a4c04a93eb5 100644 --- a/frontend/libs/studio-components/src/components/StudioTableLocalPagination/StudioTableLocalPagination.tsx +++ b/frontend/libs/studio-components/src/components/StudioTableLocalPagination/StudioTableLocalPagination.tsx @@ -10,13 +10,13 @@ export type LocalPaginationProps = { }; export type StudioTableLocalPaginationProps = { - // columns: Columns; - // rows: Rows; - // size?: 'small' | 'medium' | 'large'; - // isLoading?: boolean; - // loadingText?: string; - // emptyTableFallback?: React.ReactNode; - // pagination?: LocalPaginationProps; + columns: Columns; + rows: Rows; + size?: 'small' | 'medium' | 'large'; + isLoading?: boolean; + loadingText?: string; + emptyTableFallback?: React.ReactNode; + pagination?: LocalPaginationProps; }; export const StudioTableLocalPagination = forwardRef< From a693357c4b5743a949c38d96e2b2d68b925422cd Mon Sep 17 00:00:00 2001 From: Erling Hauan Date: Tue, 20 Aug 2024 09:14:05 +0200 Subject: [PATCH 5/6] Revert test changes --- .husky/pre-commit | 3 --- .../StudioTableLocalPagination.tsx | 14 +++++++------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 5a182ef106d..37236231717 100644 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1 @@ -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" - yarn lint-staged diff --git a/frontend/libs/studio-components/src/components/StudioTableLocalPagination/StudioTableLocalPagination.tsx b/frontend/libs/studio-components/src/components/StudioTableLocalPagination/StudioTableLocalPagination.tsx index 9ebeb71cf49..a4c04a93eb5 100644 --- a/frontend/libs/studio-components/src/components/StudioTableLocalPagination/StudioTableLocalPagination.tsx +++ b/frontend/libs/studio-components/src/components/StudioTableLocalPagination/StudioTableLocalPagination.tsx @@ -10,13 +10,13 @@ export type LocalPaginationProps = { }; export type StudioTableLocalPaginationProps = { - // columns: Columns; - // rows: Rows; - // size?: 'small' | 'medium' | 'large'; - // isLoading?: boolean; - // loadingText?: string; - // emptyTableFallback?: React.ReactNode; - // pagination?: LocalPaginationProps; + columns: Columns; + rows: Rows; + size?: 'small' | 'medium' | 'large'; + isLoading?: boolean; + loadingText?: string; + emptyTableFallback?: React.ReactNode; + pagination?: LocalPaginationProps; }; export const StudioTableLocalPagination = forwardRef< From b712fd1c3b68d24c3f6717afc20d2704abdda194 Mon Sep 17 00:00:00 2001 From: Erling Hauan Date: Thu, 22 Aug 2024 12:24:20 +0200 Subject: [PATCH 6/6] Remove install keyword from setup script in package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 807e9573ea0..ed85eb559de 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "lint:fix": "yarn run lint --fix", "codestyle:check": "prettier frontend --check", "codestyle:fix": "prettier frontend --write", - "setup": "husky install && node development/setup.js && yarn run git:ignore-revs", + "setup": "husky && node development/setup.js && yarn run git:ignore-revs", "sort-texts": "yarn workspace @altinn-studio/language run sort", "start-app-development": "yarn workspace app-development start", "start-app-preview": "yarn workspace app-preview start",