Skip to content

Commit

Permalink
Merge pull request #718 from axonivy/remove-old
Browse files Browse the repository at this point in the history
Remove old stuff
  • Loading branch information
ivy-lli authored Jan 16, 2025
2 parents 1e3c1ac + 2899d3d commit 83e4e09
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 53 deletions.
Original file line number Diff line number Diff line change
@@ -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;
};
Expand All @@ -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);
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SimpleSelect } from '@axonivy/ui-components';
import { BasicSelect } from '@axonivy/ui-components';
import { memo } from 'react';

export type SelectItem = {
Expand All @@ -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);
35 changes: 0 additions & 35 deletions packages/inscription-view/src/utils/utils.test.ts

This file was deleted.

13 changes: 0 additions & 13 deletions packages/inscription-view/src/utils/utils.ts

This file was deleted.

0 comments on commit 83e4e09

Please sign in to comment.