Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ tags table change button styles #2119

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

✨ tags table change button styles #2119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ddcfc33
change style of delete & edit buttons on tags table
TalyaNaima Sep 22, 2024
d8c8601
Merge branch 'main' into talya-t-table
sjd78 Oct 30, 2024
0ec7b9e
Merge branch 'main' into talya-t-table
sjd78 Nov 4, 2024
c8004a0
Merge branch 'main' into talya-t-table
sjd78 Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 6 additions & 23 deletions client/src/app/pages/controls/tags/components/tag-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
import React from "react";
import { useTranslation } from "react-i18next";
import {
Table,
Thead,
Tr,
Th,
Tbody,
Td,
ActionsColumn,
} from "@patternfly/react-table";
import { Table, Thead, Tr, Th, Tbody, Td } from "@patternfly/react-table";
import { Tag, TagCategory } from "@app/api/models";
import "./tag-table.css";
import { universalComparator } from "@app/utils/utils";
import { ControlTableActionButtons } from "../../ControlTableActionButtons";

export interface TabTableProps {
tagCategory: TagCategory;
Expand Down Expand Up @@ -40,20 +33,10 @@ export const TagTable: React.FC<TabTableProps> = ({
.map((tag) => (
<Tr key={tag.name}>
<Td>{tag.name}</Td>
<Td isActionCell>
<ActionsColumn
items={[
{
title: t("actions.edit"),
onClick: () => onEdit(tag),
},
{
title: t("actions.delete"),
onClick: () => onDelete(tag),
},
]}
/>
</Td>
<ControlTableActionButtons
onEdit={() => onEdit(tag)}
onDelete={() => onDelete(tag)}
/>
</Tr>
))}
</Tbody>
Expand Down
6 changes: 3 additions & 3 deletions client/src/app/pages/controls/tags/tags.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ import { COLOR_NAMES_BY_HEX_VALUE } from "@app/Constants";
import { TagForm } from "./components/tag-form";
import { TagCategoryForm } from "./components/tag-category-form";
import { getTagCategoryFallbackColor } from "@app/components/labels/item-tag-label/item-tag-label";
import { AppTableActionButtons } from "@app/components/AppTableActionButtons";
import { Color } from "@app/components/Color";
import { ConditionalRender } from "@app/components/ConditionalRender";
import { AppPlaceholder } from "@app/components/AppPlaceholder";
Expand All @@ -57,6 +56,7 @@ import {
import { useLocalTableControls } from "@app/hooks/table-controls";
import { RBAC, controlsWriteScopes, RBAC_TYPE } from "@app/rbac";
import { TagTable } from "./components/tag-table";
import { ControlTableActionButtons } from "../ControlTableActionButtons";

export const Tags: React.FC = () => {
const { t } = useTranslation();
Expand Down Expand Up @@ -385,9 +385,9 @@ export const Tags: React.FC = () => {
>
{tagCategory.tags?.length || 0}
</Td>
<AppTableActionButtons
<ControlTableActionButtons
isDeleteEnabled={!!tagCategory.tags?.length}
tooltipMessage={t(
deleteTooltipMessage={t(
"message.cannotDeleteNonEmptyTagCategory"
)}
onEdit={() => setTagCategoryModalState(tagCategory)}
Expand Down
Loading