From ef495e111886b78dfcdc4832d385346ea2723dcb Mon Sep 17 00:00:00 2001 From: Shailesh Parmar Date: Mon, 18 Jul 2022 15:09:09 +0530 Subject: [PATCH] fixed issue allow user to add tag 64 character long (#6144) --- .../resources/ui/src/pages/tags/index.tsx | 588 +++++++++--------- 1 file changed, 288 insertions(+), 300 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/tags/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/tags/index.tsx index 7c74aafb42d..0eae0184546 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/tags/index.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/tags/index.tsx @@ -143,6 +143,7 @@ const TagsPage = () => { ); showErrorToast(errMsg); setError(errMsg); + setCurrentCategory({ name } as TagCategory); setIsLoading(false); } } @@ -163,8 +164,8 @@ const TagsPage = () => { ) ) { errData['name'] = 'Name already exists'; - } else if (data.name.length < 2 || data.name.length > 25) { - errData['name'] = 'Name size must be between 2 and 25'; + } else if (data.name.length < 2 || data.name.length > 64) { + errData['name'] = 'Name size must be between 2 and 64'; } else if (!isUrlFriendlyName(data.name.trim())) { errData['name'] = 'Special characters are not allowed'; } @@ -326,8 +327,8 @@ const TagsPage = () => { ) ) { errData['name'] = 'Name already exists'; - } else if (data.name.length < 2 || data.name.length > 25) { - errData['name'] = 'Name size must be between 2 and 25'; + } else if (data.name.length < 2 || data.name.length > 64) { + errData['name'] = 'Name size must be between 2 and 64'; } setErrorDataTag(errData); @@ -474,309 +475,296 @@ const TagsPage = () => { }; return ( - <> - {error ? ( - -

{error}

-
- ) : ( - - - {isLoading ? ( - - ) : ( + + + {isLoading ? ( + + ) : error ? ( + +

{error}

+
+ ) : ( +
+ {currentCategory && (
- {currentCategory && ( -
-
- {currentCategory.displayName ?? currentCategory.name} -
-
- - - - - - -
-
- )} + className="tw-flex tw-justify-between tw-items-center" + data-testid="header">
- setIsEditCategory(false)} - onDescriptionEdit={() => setIsEditCategory(true)} - onDescriptionUpdate={UpdateCategory} - /> + className="tw-heading tw-text-link tw-text-base" + data-testid="category-name"> + {currentCategory.displayName ?? currentCategory.name}
-
- - - - - - - - - - {currentCategory?.children?.length ? ( - (currentCategory.children as TagClass[])?.map( - (tag: TagClass, index: number) => { - return ( - - - - - - ); - } - ) - ) : ( - - - +
+ + + + +
- Name - - Description - - Actions -
-

{tag.name}

-
-
-
- {tag.description ? ( - - ) : ( - - No description - - )} -
- - - -
-
- - Usage: - - {tag.usageCount ? ( - - {tag.usageCount} - - ) : ( - - Not used - - )} -
-
-
- - - -
-
- No tags available. -
+ data-testid="delete-tag-category-button" + size="small" + theme="primary" + variant="outlined" + onClick={() => { + deleteTagHandler(); + }}> + Delete category + +
- {isEditTag && ( - { - setIsEditTag(false); - setEditTag(undefined); - }} - onSave={updatePrimaryTag} - /> - )} - {isAddingCategory && ( - setIsAddingCategory(false)} - onChange={(data) => { - setErrorDataCategory({}); - onNewCategoryChange(data as TagCategory); - }} - onSave={(data) => createCategory(data as TagCategory)} - /> - )} - {isAddingTag && ( - setIsAddingTag(false)} - onChange={(data) => { - setErrorDataTag({}); - onNewTagChange(data as TagCategory); - }} - onSave={(data) => createPrimaryTag(data as TagCategory)} - /> - )} - {deleteTags.state && ( - - setDeleteTags({ data: undefined, state: false }) - } - onConfirm={handleConfirmClick} - /> - )}
)} - - - )} - +
+ setIsEditCategory(false)} + onDescriptionEdit={() => setIsEditCategory(true)} + onDescriptionUpdate={UpdateCategory} + /> +
+
+ + + + + + + + + + {currentCategory?.children?.length ? ( + (currentCategory.children as TagClass[])?.map( + (tag: TagClass, index: number) => { + return ( + + + + + + ); + } + ) + ) : ( + + + + )} + +
+ Name + + Description + + Actions +
+

{tag.name}

+
+
+
+ {tag.description ? ( + + ) : ( + + No description + + )} +
+ + + +
+
+ + Usage: + + {tag.usageCount ? ( + + {tag.usageCount} + + ) : ( + + Not used + + )} +
+
+
+ + + +
+
+ No tags available. +
+
+ {isEditTag && ( + { + setIsEditTag(false); + setEditTag(undefined); + }} + onSave={updatePrimaryTag} + /> + )} + {isAddingCategory && ( + setIsAddingCategory(false)} + onChange={(data) => { + setErrorDataCategory({}); + onNewCategoryChange(data as TagCategory); + }} + onSave={(data) => createCategory(data as TagCategory)} + /> + )} + {isAddingTag && ( + setIsAddingTag(false)} + onChange={(data) => { + setErrorDataTag({}); + onNewTagChange(data as TagCategory); + }} + onSave={(data) => createPrimaryTag(data as TagCategory)} + /> + )} + {deleteTags.state && ( + + setDeleteTags({ data: undefined, state: false }) + } + onConfirm={handleConfirmClick} + /> + )} +
+ )} +
+
); };