yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-12-27 07:28:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improvement: made UI of disable button for teams and tags page same as services page (#1170)

Browse Source
This commit is contained in:
Shailesh Parmar 2021-11-12 22:13:30 +05:30 committed by GitHub
parent 42caa8abf4
commit 055f629cab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
catalog-rest-service/src/main/resources/ui/src/pages/tags/index.tsx
View File

@ -16,6 +16,7 @@
*/
import { AxiosError, AxiosResponse } from 'axios';
import classNames from 'classnames';
import { EntityTags } from 'Models';
import React, { useEffect, useState } from 'react';
import { Link } from 'react-router-dom';
@ -44,12 +45,14 @@ import {
TagCategoryType,
} from '../../generated/api/tags/createTagCategory';
import { TagCategory, TagClass } from '../../generated/entity/tags/tagCategory';
import { useAuth } from '../../hooks/authHooks';
import { isEven } from '../../utils/CommonUtils';
import SVGIcons from '../../utils/SvgUtils';
import { getTagCategories, getTaglist } from '../../utils/TagsUtils';
import Form from './Form';
// import { Tag, TagsCategory } from './tagsTypes';
const TagsPage = () => {
const { isAuthDisabled, isAdminUser } = useAuth();
const [categories, setCategoreis] = useState<Array<TagCategory>>([]);
const [currentCategory, setCurrentCategory] = useState<TagCategory>();
const [isEditCategory, setIsEditCategory] = useState<boolean>(false);
@ -183,7 +186,9 @@ const TagsPage = () => {
<h6 className="tw-heading">Tag Categories</h6>
<NonAdminAction position="bottom" title={TITLE_FOR_NON_ADMIN_ACTION}>
<Button
className="tw-h-7 tw-px-2"
className={classNames('tw-h-7 tw-px-2', {
'tw-opacity-40': !isAdminUser && !isAuthDisabled,
})}
data-testid="add-category"
size="small"
theme="primary"
@ -238,9 +243,11 @@ const TagsPage = () => {
</div>
<NonAdminAction
position="bottom"
title="Only Admin is allowed for the action">
title={TITLE_FOR_NON_ADMIN_ACTION}>
<Button
className="tw-h-8 tw-rounded tw-mb-2"
className={classNames('tw-h-8 tw-rounded tw-mb-2', {
'tw-opacity-40': !isAdminUser && !isAuthDisabled,
})}
data-testid="add-new-tag-button"
size="small"
theme="primary"
@ -261,7 +268,7 @@ const TagsPage = () => {
<div className="tw-flex-initial">
<NonAdminAction
position="bottom"
title="Only Admin is allowed for the action">
title={TITLE_FOR_NON_ADMIN_ACTION}>
<button
className="focus:tw-outline-none"
data-testid="add-description"

9
catalog-rest-service/src/main/resources/ui/src/pages/teams/index.tsx
View File

@ -16,6 +16,7 @@
*/
import { AxiosError, AxiosResponse } from 'axios';
import classNames from 'classnames';
import { compare } from 'fast-json-patch';
import { observer } from 'mobx-react';
import React, { useEffect, useState } from 'react';
@ -281,7 +282,9 @@ const TeamsPage = () => {
<h6 className="tw-heading">Teams</h6>
<NonAdminAction position="bottom" title={TITLE_FOR_NON_ADMIN_ACTION}>
<Button
className="tw-h-7 tw-px-2"
className={classNames('tw-h-7 tw-px-2', {
'tw-opacity-40': !isAdminUser && !isAuthDisabled,
})}
data-testid="add-teams"
size="small"
theme="primary"
@ -391,7 +394,9 @@ const TeamsPage = () => {
position="bottom"
title={TITLE_FOR_NON_ADMIN_ACTION}>
<Button
className="tw-h-8 tw-rounded tw-mb-2"
className={classNames('tw-h-8 tw-rounded tw-mb-2', {
'tw-opacity-40': !isAdminUser && !isAuthDisabled,
})}
data-testid="add-new-user-button"
size="small"
theme="primary"