diff --git a/tavla/app/(admin)/boards/components/Column/Actions.tsx b/tavla/app/(admin)/boards/components/Column/Actions.tsx index 379a9bb8c..79f656fa1 100644 --- a/tavla/app/(admin)/boards/components/Column/Actions.tsx +++ b/tavla/app/(admin)/boards/components/Column/Actions.tsx @@ -7,7 +7,6 @@ import { Delete } from './Delete' import { Open } from 'app/(admin)/edit/[id]/components/Buttons/Open' import { Copy } from 'app/(admin)/edit/[id]/components/Buttons/Copy' import { Tooltip } from '@entur/tooltip' -import ClientOnly from 'app/components/NoSSR/ClientOnly' function Actions({ board }: { board: TBoard }) { return ( @@ -24,17 +23,19 @@ function Actions({ board }: { board: TBoard }) { function Edit({ bid }: { bid?: string }) { return ( - - - - - - - + + + + + ) } diff --git a/tavla/app/(admin)/boards/components/Column/Delete.tsx b/tavla/app/(admin)/boards/components/Column/Delete.tsx index 697ef2482..ac2d15571 100644 --- a/tavla/app/(admin)/boards/components/Column/Delete.tsx +++ b/tavla/app/(admin)/boards/components/Column/Delete.tsx @@ -16,7 +16,6 @@ import { SubmitButton } from 'components/Form/SubmitButton' import { OverflowMenuItem } from '@entur/menu' import { useToast } from '@entur/alert' import { deleteBoardAction } from '../../utils/actions' -import ClientOnly from 'app/components/NoSSR/ClientOnly' function Delete({ board, @@ -37,11 +36,14 @@ function Delete({ return ( <> - - - - - + + + + {hiddenNumber > 0 && ( - - - } - > - - + {hiddenNumber} - - - + + } + id="tooltip-tags" + > + + + {hiddenNumber} + + )} diff --git a/tavla/app/(admin)/boards/components/TagModal/index.tsx b/tavla/app/(admin)/boards/components/TagModal/index.tsx index 3a570d6e9..0937d7a69 100644 --- a/tavla/app/(admin)/boards/components/TagModal/index.tsx +++ b/tavla/app/(admin)/boards/components/TagModal/index.tsx @@ -14,7 +14,6 @@ import { getFormFeedbackForField } from 'app/(admin)/utils' import { useModalWithValue } from '../../hooks/useModalWithValue' import { DEFAULT_BOARD_NAME } from 'app/(admin)/utils/constants' import { removeTag } from './actions' -import ClientOnly from 'app/components/NoSSR/ClientOnly' function TagModal({ board }: { board: TBoard }) { const tags = board.meta?.tags ?? [] @@ -22,16 +21,15 @@ function TagModal({ board }: { board: TBoard }) { const [state, action] = useActionState(removeTag, undefined) return ( <> - - - - - - - + + + + + - - - - {type === 'secondary' && 'Slett'} - - - - + + + {type === 'secondary' && 'Slett'} + + + + - - - - - - + + + + + ) } export { Copy } diff --git a/tavla/app/(admin)/edit/[id]/components/Buttons/Open.tsx b/tavla/app/(admin)/edit/[id]/components/Buttons/Open.tsx index e3744a5e1..b7c9e0d9b 100644 --- a/tavla/app/(admin)/edit/[id]/components/Buttons/Open.tsx +++ b/tavla/app/(admin)/edit/[id]/components/Buttons/Open.tsx @@ -2,7 +2,7 @@ import { Button, IconButton } from '@entur/button' import { ExternalIcon } from '@entur/icons' import { Tooltip } from '@entur/tooltip' -import ClientOnly from 'app/components/NoSSR/ClientOnly' + import { useLink } from 'hooks/useLink' import Link from 'next/link' import { usePostHog } from 'posthog-js/react' @@ -28,19 +28,21 @@ function Open({ type, bid }: { type?: 'button' | 'icon'; bid?: string }) { } return ( - - - posthog.capture('OPEN_BOARD_BTN')} - > - - - - + + posthog.capture('OPEN_BOARD_BTN')} + > + + + ) } diff --git a/tavla/app/(admin)/edit/[id]/components/Footer/index.tsx b/tavla/app/(admin)/edit/[id]/components/Footer/index.tsx index b666d06c2..c83a9387c 100644 --- a/tavla/app/(admin)/edit/[id]/components/Footer/index.tsx +++ b/tavla/app/(admin)/edit/[id]/components/Footer/index.tsx @@ -8,7 +8,7 @@ import { TBoardID, TFooter } from 'types/settings' import { setFooter } from './actions' import { useState } from 'react' import { Tooltip } from '@entur/tooltip' -import ClientOnly from 'app/components/NoSSR/ClientOnly' + import ClientOnlyTextField from 'app/components/NoSSR/TextField' function Footer({ @@ -40,14 +40,14 @@ function Footer({
Infomelding - - - - - + + + +
Adresse - - - - - + + + +
diff --git a/tavla/app/(admin)/edit/[id]/components/TileCard/index.tsx b/tavla/app/(admin)/edit/[id]/components/TileCard/index.tsx index 0dc9fd581..16eb3c22d 100644 --- a/tavla/app/(admin)/edit/[id]/components/TileCard/index.tsx +++ b/tavla/app/(admin)/edit/[id]/components/TileCard/index.tsx @@ -57,7 +57,6 @@ import { getFormFeedbackForField, } from 'app/(admin)/utils' import { NEW_LINE_IDS, OLD_LINE_IDS, SWITCH_DATE } from '../../compatibility' -import ClientOnly from 'app/components/NoSSR/ClientOnly' import ClientOnlyTextField from 'app/components/NoSSR/TextField' function TileCard({ @@ -381,23 +380,21 @@ function TileCard({
Kolonner - - + setIsColumnModalOpen(true)} > - - setIsColumnModalOpen(true) - } - > - - - - + + +
diff --git a/tavla/app/(admin)/organizations/components/Actions.tsx b/tavla/app/(admin)/organizations/components/Actions.tsx index 2ebcd4d43..00eea20ad 100644 --- a/tavla/app/(admin)/organizations/components/Actions.tsx +++ b/tavla/app/(admin)/organizations/components/Actions.tsx @@ -5,22 +5,23 @@ import Link from 'next/link' import { TOrganization, TUserID } from 'types/settings' import { Delete } from 'app/(admin)/components/Delete' import { Tooltip } from '@entur/tooltip' -import ClientOnly from 'app/components/NoSSR/ClientOnly' function Edit({ oid }: { oid?: string }) { return ( - - - - - - - + + + + + ) } diff --git a/tavla/app/(admin)/organizations/components/DefaultColumns/index.tsx b/tavla/app/(admin)/organizations/components/DefaultColumns/index.tsx index 97d333438..2d116fb81 100644 --- a/tavla/app/(admin)/organizations/components/DefaultColumns/index.tsx +++ b/tavla/app/(admin)/organizations/components/DefaultColumns/index.tsx @@ -17,7 +17,6 @@ import { Tooltip } from '@entur/tooltip' import { IconButton } from '@entur/button' import { QuestionFilledIcon } from '@entur/icons' import { ColumnModal } from './ColumnModal' -import ClientOnly from 'app/components/NoSSR/ClientOnly' function DefaultColumns({ oid, @@ -53,21 +52,21 @@ function DefaultColumns({
Kolonner - - + setIsOpen(true)} > - setIsOpen(true)} - > - - - - + + +
diff --git a/tavla/app/(admin)/organizations/components/MemberAdministration/RemoveUserButton.tsx b/tavla/app/(admin)/organizations/components/MemberAdministration/RemoveUserButton.tsx index c4d3cb632..b427630ee 100644 --- a/tavla/app/(admin)/organizations/components/MemberAdministration/RemoveUserButton.tsx +++ b/tavla/app/(admin)/organizations/components/MemberAdministration/RemoveUserButton.tsx @@ -14,7 +14,6 @@ import Image from 'next/image' import sheep from 'assets/illustrations/Sheep.png' import { useModalWithValue } from 'app/(admin)/boards/hooks/useModalWithValue' import { removeUser } from './actions' -import ClientOnly from 'app/components/NoSSR/ClientOnly' function RemoveUserButton({ user, @@ -30,17 +29,20 @@ function RemoveUserButton({ ) return ( <> - - - - - - - + + + + + +