From e63697c6a8e030360c54f1c292da604d36e44362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Solga=CC=8Ard?= <vetle.bu.solgard@nav.no>
Date: Tue, 15 Oct 2024 16:10:21 +0200
Subject: [PATCH] IS-2729: Remove toggle for hendelse column

---
 server/unleash.ts                       | 10 +++------
 src/components/NewOversiktTable.tsx     | 30 ++++++++++---------------
 src/data/unleash/types/unleash_types.ts |  2 --
 3 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/server/unleash.ts b/server/unleash.ts
index 146373dc..8b8205e9 100644
--- a/server/unleash.ts
+++ b/server/unleash.ts
@@ -1,6 +1,6 @@
 import unleashClient = require('unleash-client');
-import { Strategy } from 'unleash-client';
 import Config = require('./config');
+import { Strategy } from 'unleash-client';
 import { Context } from 'unleash-client/lib/context';
 
 const { initialize } = unleashClient;
@@ -32,7 +32,7 @@ export const unleash = initialize({
   strategies: [new VeilederIds(), new EnhetIds()],
 });
 
-export const getToggles = (veilederId: any, enhetId: any) => {
+export function getToggles(veilederId: any, enhetId: any) {
   const context = {
     veilederId: veilederId,
     enhetId: enhetId,
@@ -44,13 +44,9 @@ export const getToggles = (veilederId: any, enhetId: any) => {
       'isOppfolgingISenFaseEnabled',
       context
     ),
-    isHendelseColumnEnabled: unleash.isEnabled(
-      'isHendelseColumnEnabled',
-      context
-    ),
     isManglendeMedvirkningEnabled: unleash.isEnabled(
       'isManglendeMedvirkningEnabled',
       context
     ),
   };
-};
+}
diff --git a/src/components/NewOversiktTable.tsx b/src/components/NewOversiktTable.tsx
index 8878e584..07874df7 100644
--- a/src/components/NewOversiktTable.tsx
+++ b/src/components/NewOversiktTable.tsx
@@ -9,7 +9,6 @@ import { Sorting, SortingKey, useSorting } from '@/hooks/useSorting';
 import { LinkSyfomodiaperson } from '@/components/LinkSyfomodiaperson';
 import { toLastnameFirstnameFormat } from '@/utils/stringUtil';
 import { getHendelser } from '@/utils/statusColumnUtils';
-import { useFeatureToggles } from '@/data/unleash/unleashQueryHooks';
 import { useTabType } from '@/context/tab/TabTypeContext';
 import { OverviewTabType } from '@/konstanter';
 
@@ -37,7 +36,6 @@ export const NewOversiktTable = ({
   setSorting,
 }: Props): ReactElement => {
   const { columns } = useSorting();
-  const { toggles } = useFeatureToggles();
   const { tabType } = useTabType();
 
   const handleSort = (sortKey: string | undefined) => {
@@ -99,10 +97,8 @@ export const NewOversiktTable = ({
           {columns
             .filter(
               (column) =>
-                (toggles.isHendelseColumnEnabled ||
-                  column.sortKey !== 'HENDELSE') &&
-                (tabType === OverviewTabType.ENHET_OVERVIEW ||
-                  column.sortKey !== 'VEILEDER')
+                tabType === OverviewTabType.ENHET_OVERVIEW ||
+                column.sortKey !== 'VEILEDER'
             )
             .map((col, index) => (
               <Table.ColumnHeader key={index} sortKey={col.sortKey} sortable>
@@ -161,18 +157,16 @@ export const NewOversiktTable = ({
             <Table.DataCell textSize="small">
               <FristColumn personData={persondata} />
             </Table.DataCell>
-            {toggles.isHendelseColumnEnabled && (
-              <Table.DataCell
-                textSize="small"
-                className="[&>*:not(:last-child)]:mb-1.5"
-              >
-                {getHendelser(persondata).map((status, index) => (
-                  <p key={index} className="m-0">
-                    {status}
-                  </p>
-                ))}
-              </Table.DataCell>
-            )}
+            <Table.DataCell
+              textSize="small"
+              className="[&>*:not(:last-child)]:mb-1.5"
+            >
+              {getHendelser(persondata).map((status, index) => (
+                <p key={index} className="m-0">
+                  {status}
+                </p>
+              ))}
+            </Table.DataCell>
           </Table.Row>
         ))}
       </Table.Body>
diff --git a/src/data/unleash/types/unleash_types.ts b/src/data/unleash/types/unleash_types.ts
index c0fc12be..cda8e98a 100644
--- a/src/data/unleash/types/unleash_types.ts
+++ b/src/data/unleash/types/unleash_types.ts
@@ -7,7 +7,6 @@ export enum ToggleNames {
   isFlexjarArenaEnabled = 'isFlexjarArenaEnabled',
   isFrisktilarbeidEnabled = 'isFrisktilarbeidEnabled',
   isOppfolgingISenFaseEnabled = 'isOppfolgingISenFaseEnabled',
-  isHendelseColumnEnabled = 'isHendelseColumnEnabled',
   isManglendeMedvirkningEnabled = 'isManglendeMedvirkningEnabled',
 }
 
@@ -15,6 +14,5 @@ export const defaultToggles: Toggles = {
   isFlexjarArenaEnabled: false,
   isFrisktilarbeidEnabled: false,
   isOppfolgingISenFaseEnabled: false,
-  isHendelseColumnEnabled: false,
   isManglendeMedvirkningEnabled: false,
 };