diff --git a/label_studio/core/feature_flags/stale_feature_flags.py b/label_studio/core/feature_flags/stale_feature_flags.py index 410d20b7ecc9..7647b79b9484 100644 --- a/label_studio/core/feature_flags/stale_feature_flags.py +++ b/label_studio/core/feature_flags/stale_feature_flags.py @@ -27,5 +27,4 @@ 'fflag_feat_front_leap_1198_unsaved_changes_180724': True, 'fflag_fix_leap_246_multi_object_hotkeys_160124_short': True, 'fflag_fix_leap_466_text_sanitization': True, - 'fflag_fix_front_leap_218_improve_performance_of_taxonomy_search_short': True, } diff --git a/web/libs/editor/src/components/Comments/Comment/CommentForm.tsx b/web/libs/editor/src/components/Comments/Comment/CommentForm.tsx index 927ab112715a..4cdb71a84e02 100644 --- a/web/libs/editor/src/components/Comments/Comment/CommentForm.tsx +++ b/web/libs/editor/src/components/Comments/Comment/CommentForm.tsx @@ -177,7 +177,6 @@ export const CommentForm: FC = observer(({ commentStore, annot items={classificationsItems} onChange={taxonomyOnChange} options={COMMENT_TAXONOMY_OPTIONS} - defaultSearch={false} /> diff --git a/web/libs/editor/src/components/Comments/Comment/CommentItem.tsx b/web/libs/editor/src/components/Comments/Comment/CommentItem.tsx index f1232ac111f3..3408db6a2713 100644 --- a/web/libs/editor/src/components/Comments/Comment/CommentItem.tsx +++ b/web/libs/editor/src/components/Comments/Comment/CommentItem.tsx @@ -202,7 +202,6 @@ export const CommentItem: FC = observer( items={classificationsItems} onChange={taxonomyOnChange} options={COMMENT_TAXONOMY_OPTIONS} - defaultSearch={false} /> )} diff --git a/web/libs/editor/src/components/NewTaxonomy/NewTaxonomy.tsx b/web/libs/editor/src/components/NewTaxonomy/NewTaxonomy.tsx index 73aa7e7c01d8..6c6cfa475aec 100644 --- a/web/libs/editor/src/components/NewTaxonomy/NewTaxonomy.tsx +++ b/web/libs/editor/src/components/NewTaxonomy/NewTaxonomy.tsx @@ -56,7 +56,6 @@ type TaxonomyProps = { onDeleteLabel?: onDeleteLabelCallback; options: TaxonomyOptions; isEditable?: boolean; - defaultSearch?: boolean; }; type TaxonomyExtendedOptions = TaxonomyOptions & { @@ -107,7 +106,6 @@ const NewTaxonomy = ({ selected, onChange, onLoadData, - defaultSearch = true, // @todo implement user labels // onAddLabel, // onDeleteLabel, @@ -146,7 +144,7 @@ const NewTaxonomy = ({ (origin: ReactNode) => { return ( <> - {!defaultSearch && } + {origin} ); @@ -171,7 +169,7 @@ const NewTaxonomy = ({ return ( @@ -182,11 +180,11 @@ const NewTaxonomy = ({ } loadData={loadData} treeCheckable - showSearch={defaultSearch} - showArrow={!defaultSearch} + showSearch={false} + showArrow dropdownRender={renderDropdown} onDropdownVisibleChange={handleDropdownChange} - treeExpandedKeys={!defaultSearch ? expandedKeys : undefined} + treeExpandedKeys={expandedKeys} onTreeExpand={(expandedKeys: React.Key[]) => { setExpandedKeys(expandedKeys); }} diff --git a/web/libs/editor/src/tags/control/Taxonomy/Taxonomy.jsx b/web/libs/editor/src/tags/control/Taxonomy/Taxonomy.jsx index 2596a4aa29f8..882ccedc8057 100644 --- a/web/libs/editor/src/tags/control/Taxonomy/Taxonomy.jsx +++ b/web/libs/editor/src/tags/control/Taxonomy/Taxonomy.jsx @@ -19,7 +19,7 @@ import SelectedChoiceMixin from "../../../mixins/SelectedChoiceMixin"; import { SharedStoreMixin } from "../../../mixins/SharedChoiceStore/mixin"; import VisibilityMixin from "../../../mixins/Visibility"; import { parseValue } from "../../../utils/data"; -import { FF_LEAP_218, FF_LSDV_4583, FF_TAXONOMY_ASYNC, FF_TAXONOMY_LABELING, isFF } from "../../../utils/feature-flags"; +import { FF_LSDV_4583, FF_TAXONOMY_ASYNC, FF_TAXONOMY_LABELING, isFF } from "../../../utils/feature-flags"; import ControlBase from "../Base"; import ClassificationBase from "../ClassificationBase"; @@ -625,7 +625,6 @@ const HtxTaxonomy = observer(({ item }) => { onAddLabel={item.userLabels && item.onAddLabel} onDeleteLabel={item.userLabels && item.onDeleteLabel} options={options} - defaultSearch={!isFF(FF_LEAP_218)} isEditable={!item.isReadOnly()} /> ) : ( diff --git a/web/libs/editor/src/utils/feature-flags.ts b/web/libs/editor/src/utils/feature-flags.ts index 4256d399b10d..308389658d2b 100644 --- a/web/libs/editor/src/utils/feature-flags.ts +++ b/web/libs/editor/src/utils/feature-flags.ts @@ -127,8 +127,6 @@ export const FF_LSDV_4998 = "fflag_fix_front_lsdv_4998_missed_dynamic_children_0 */ export const FF_TAXONOMY_ASYNC = "fflag_feat_front_lsdv_5451_async_taxonomy_110823_short"; -export const FF_LEAP_218 = "fflag_fix_front_leap_218_improve_performance_of_taxonomy_search_short"; - /** * Allow to label NER directly with Taxonomy instead of Labels * @link https://app.launchdarkly.com/default/production/features/fflag_feat_front_lsdv_5452_taxonomy_labeling_110823_short