From 2899d3d58917606f96d5da4623d1c49a14152227 Mon Sep 17 00:00:00 2001
From: Lukas Lieb <lukas.lieb@axonivy.com>
Date: Thu, 16 Jan 2025 13:18:32 +0100
Subject: [PATCH] Remove old stuff

---
 .../components/widgets/fieldset/Fieldset.tsx  |  6 ++--
 .../src/components/widgets/select/Select.tsx  |  4 +--
 .../inscription-view/src/utils/utils.test.ts  | 35 -------------------
 packages/inscription-view/src/utils/utils.ts  | 13 -------
 4 files changed, 5 insertions(+), 53 deletions(-)
 delete mode 100644 packages/inscription-view/src/utils/utils.test.ts
 delete mode 100644 packages/inscription-view/src/utils/utils.ts

diff --git a/packages/inscription-view/src/components/widgets/fieldset/Fieldset.tsx b/packages/inscription-view/src/components/widgets/fieldset/Fieldset.tsx
index 0476f6e4b..2c415e5eb 100644
--- a/packages/inscription-view/src/components/widgets/fieldset/Fieldset.tsx
+++ b/packages/inscription-view/src/components/widgets/fieldset/Fieldset.tsx
@@ -1,9 +1,9 @@
 import { memo } from 'react';
 import type { FieldsetControl } from './fieldset-control';
-import { ButtonGroup, Fieldset as Field, type FieldsetProps as FieldProps } from '@axonivy/ui-components';
+import { ButtonGroup, BasicField, type BasicFieldProps } from '@axonivy/ui-components';
 import { toMessageData, type ValidationMessage } from '../message/Message';
 
-export type FieldsetProps = Omit<FieldProps, 'message' | 'control'> & {
+export type FieldsetProps = Omit<BasicFieldProps, 'message' | 'control'> & {
   controls?: Array<FieldsetControl>;
   validation?: ValidationMessage;
 };
@@ -26,7 +26,7 @@ const Controls = ({ controls }: Pick<FieldsetProps, 'controls'>) => {
 };
 
 const Fieldset = ({ label, controls, validation, ...props }: FieldsetProps) => {
-  return <Field label={label} message={toMessageData(validation)} control={<Controls controls={controls} />} {...props} />;
+  return <BasicField label={label} message={toMessageData(validation)} control={<Controls controls={controls} />} {...props} />;
 };
 
 export default memo(Fieldset);
diff --git a/packages/inscription-view/src/components/widgets/select/Select.tsx b/packages/inscription-view/src/components/widgets/select/Select.tsx
index a6160413d..e753f68c0 100644
--- a/packages/inscription-view/src/components/widgets/select/Select.tsx
+++ b/packages/inscription-view/src/components/widgets/select/Select.tsx
@@ -1,4 +1,4 @@
-import { SimpleSelect } from '@axonivy/ui-components';
+import { BasicSelect } from '@axonivy/ui-components';
 import { memo } from 'react';
 
 export type SelectItem = {
@@ -22,7 +22,7 @@ const Select = ({ value, onChange, items, emptyItem, disabled }: SelectProps) =>
     onChange(item ?? EMPTY_SELECT_ITEM);
   };
 
-  return <SimpleSelect value={value?.value} onValueChange={onValueChange} items={items} emptyItem={emptyItem} disabled={disabled} />;
+  return <BasicSelect value={value?.value} onValueChange={onValueChange} items={items} emptyItem={emptyItem} disabled={disabled} />;
 };
 
 export default memo(Select);
diff --git a/packages/inscription-view/src/utils/utils.test.ts b/packages/inscription-view/src/utils/utils.test.ts
deleted file mode 100644
index adea430ba..000000000
--- a/packages/inscription-view/src/utils/utils.test.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { generateId, splitMacroExpressions, splitNewLine } from './utils';
-import { test, expect } from 'vitest';
-
-test('generateId', () => {
-  expect(generateId()).toEqual('0');
-  expect(generateId()).toEqual('1');
-  expect(generateId()).toEqual('2');
-});
-
-test('splitNewLine', () => {
-  expect(splitNewLine('')).toEqual(['']);
-  expect(splitNewLine('abc')).toEqual(['abc']);
-  expect(splitNewLine('abc\ndef')).toEqual(['abc', 'def']);
-  expect(splitNewLine('abc\rdef')).toEqual(['abc', 'def']);
-  expect(splitNewLine('abc\r\ndef')).toEqual(['abc', 'def']);
-});
-
-test('splitMacroExpressions', () => {
-  expect(splitMacroExpressions('')).toEqual([]);
-  expect(splitMacroExpressions('abc')).toEqual(['abc']);
-  expect(splitMacroExpressions('abc <%= ivy.cms.co("hi") %>')).toEqual(['abc ', '<%= ivy.cms.co("hi") %>']);
-  expect(splitMacroExpressions('abc <%= ivy.cms.co("hi") %>, hi')).toEqual(['abc ', '<%= ivy.cms.co("hi") %>', ', hi']);
-  expect(splitMacroExpressions('abc <%= ivy.cms.co("hi") %>, hi <%=in.accept%>')).toEqual([
-    'abc ',
-    '<%= ivy.cms.co("hi") %>',
-    ', hi ',
-    '<%=in.accept%>'
-  ]);
-  expect(splitMacroExpressions('<%= ivy.cms.co("hi") %><%=in.accept%>')).toEqual(['<%= ivy.cms.co("hi") %>', '<%=in.accept%>']);
-});
-
-test('splitMacroExpressions not supported', () => {
-  //The following test should result in ['abc ', '<%= ivy.cms.co("hi %>") %>']
-  expect(splitMacroExpressions('abc <%= ivy.cms.co("hi %>") %>')).toEqual(['abc ', '<%= ivy.cms.co("hi %>', '") %>']);
-});
diff --git a/packages/inscription-view/src/utils/utils.ts b/packages/inscription-view/src/utils/utils.ts
deleted file mode 100644
index abd17c65f..000000000
--- a/packages/inscription-view/src/utils/utils.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-let idCounter = 0;
-
-export function generateId() {
-  return String(idCounter++);
-}
-
-export function splitNewLine(text: string) {
-  return text.split(/\r\n|\r|\n/);
-}
-
-export function splitMacroExpressions(text: string) {
-  return text.split(/(<%=\s*[\s\S]*?\s*%>)/gm).filter(subtext => subtext.length > 0);
-}