diff --git a/changes/issue-6979-remove-scheduled-queries-remove-button b/changes/issue-6979-remove-scheduled-queries-remove-button new file mode 100644 index 0000000000..bef6d55f92 --- /dev/null +++ b/changes/issue-6979-remove-scheduled-queries-remove-button @@ -0,0 +1 @@ +* Rename CTA button to Remove for Remove scheduled queries \ No newline at end of file diff --git a/cypress/integration/all/app/policiesflow.spec.ts b/cypress/integration/all/app/policiesflow.spec.ts index 3a5d60f922..6df697d62e 100644 --- a/cypress/integration/all/app/policiesflow.spec.ts +++ b/cypress/integration/all/app/policiesflow.spec.ts @@ -15,11 +15,9 @@ describe("Policies flow (empty)", () => { cy.visit("/policies/manage"); }); it("creates a custom policy", () => { - cy.getAttached(".policies-list-wrapper__action-button-container").within( - () => { - cy.findByText(/add a policy/i).click(); - } - ); + cy.getAttached(".policies-table__action-button-container").within(() => { + cy.findByText(/add a policy/i).click(); + }); cy.findByText(/create your own policy/i).click(); cy.getAttached(".ace_scroller") .click({ force: true }) diff --git a/cypress/integration/all/app/queryflow.spec.ts b/cypress/integration/all/app/queryflow.spec.ts index c71a476bd6..9aec747b47 100644 --- a/cypress/integration/all/app/queryflow.spec.ts +++ b/cypress/integration/all/app/queryflow.spec.ts @@ -17,7 +17,7 @@ describe("Query flow (empty)", () => { cy.visit("/queries/manage"); }); it("creates a new query", () => { - cy.getAttached(".queries-list-wrapper__create-button").click(); + cy.getAttached(".queries-table__create-button").click(); cy.getAttached(".ace_scroller") .click({ force: true }) .type("{selectall}SELECT * FROM windows_crashes;"); diff --git a/cypress/integration/premium/admin.spec.ts b/cypress/integration/premium/admin.spec.ts index 2d9b2f1f9d..32cb520dbe 100644 --- a/cypress/integration/premium/admin.spec.ts +++ b/cypress/integration/premium/admin.spec.ts @@ -547,7 +547,7 @@ describe("Premium tier - Global Admin user", () => { describe("Manage policies page", () => { beforeEach(() => cy.visit("/policies/manage")); it("allows global admin to add a new policy", () => { - cy.getAttached(".policies-list-wrapper__action-button-container") + cy.getAttached(".policies-table__action-button-container") .findByRole("button", { name: /add a policy/i }) .click(); // Add a default policy diff --git a/cypress/integration/premium/maintainer.spec.ts b/cypress/integration/premium/maintainer.spec.ts index af63953786..384633e71d 100644 --- a/cypress/integration/premium/maintainer.spec.ts +++ b/cypress/integration/premium/maintainer.spec.ts @@ -234,7 +234,7 @@ describe("Premium tier - Maintainer user", () => { cy.findByText(/manage hosts/i).should("not.exist"); }); it("allows global maintainer to add a new policy", () => { - cy.getAttached(".policies-list-wrapper__action-button-container") + cy.getAttached(".policies-table__action-button-container") .findByRole("button", { name: /add a policy/i }) .click(); // Add a default policy diff --git a/frontend/components/forms/packs/EditPackForm/EditPackForm.tsx b/frontend/components/forms/packs/EditPackForm/EditPackForm.tsx index 8bdba0c46b..f25f2e181f 100644 --- a/frontend/components/forms/packs/EditPackForm/EditPackForm.tsx +++ b/frontend/components/forms/packs/EditPackForm/EditPackForm.tsx @@ -10,7 +10,7 @@ import { ITarget, ITargetsAPIResponse } from "interfaces/target"; import InputField from "components/forms/fields/InputField"; // @ts-ignore import SelectTargetsDropdown from "components/forms/fields/SelectTargetsDropdown"; -import PackQueriesListWrapper from "components/queries/PackQueriesListWrapper"; +import PackQueriesTable from "components/queries/PackQueriesTable"; const baseClass = "edit-pack-form"; @@ -128,7 +128,7 @@ const EditPackForm = ({ targetsCount={targetsCount} isPremiumTier={isPremiumTier} /> - void; onEditPackQuery: (selectedQuery: IScheduledQuery) => void; onRemovePackQueries: (selectedTableQueryIds: number[]) => void; @@ -22,13 +22,13 @@ interface IPackQueriesListWrapperProps { isLoadingPackQueries: boolean; } -const PackQueriesListWrapper = ({ +const PackQueriesTable = ({ onAddPackQuery, onEditPackQuery, onRemovePackQueries, scheduledQueries, isLoadingPackQueries, -}: IPackQueriesListWrapperProps): JSX.Element => { +}: IPackQueriesTableProps): JSX.Element => { const [querySearchText, setQuerySearchText] = useState(""); // NOTE: this is called once on the initial rendering. The initial render of @@ -115,4 +115,4 @@ const PackQueriesListWrapper = ({ ); }; -export default PackQueriesListWrapper; +export default PackQueriesTable; diff --git a/frontend/components/queries/PackQueriesListWrapper/PackQueriesTable/PackQueriesTableConfig.tsx b/frontend/components/queries/PackQueriesTable/PackQueriesTable/PackQueriesTableConfig.tsx similarity index 100% rename from frontend/components/queries/PackQueriesListWrapper/PackQueriesTable/PackQueriesTableConfig.tsx rename to frontend/components/queries/PackQueriesTable/PackQueriesTable/PackQueriesTableConfig.tsx diff --git a/frontend/components/queries/PackQueriesListWrapper/_styles.scss b/frontend/components/queries/PackQueriesTable/_styles.scss similarity index 98% rename from frontend/components/queries/PackQueriesListWrapper/_styles.scss rename to frontend/components/queries/PackQueriesTable/_styles.scss index 032f400c43..7bc7eae848 100644 --- a/frontend/components/queries/PackQueriesListWrapper/_styles.scss +++ b/frontend/components/queries/PackQueriesTable/_styles.scss @@ -1,4 +1,4 @@ -.pack-queries-list-wrapper { +.pack-queries-table { flex-grow: 1; padding: $pad-xlarge 0; margin-bottom: $pad-medium; diff --git a/frontend/components/queries/PackQueriesTable/index.ts b/frontend/components/queries/PackQueriesTable/index.ts new file mode 100644 index 0000000000..dd5f51e85d --- /dev/null +++ b/frontend/components/queries/PackQueriesTable/index.ts @@ -0,0 +1 @@ +export { default } from "./PackQueriesTable"; diff --git a/frontend/pages/packs/ManagePacksPage/ManagePacksPage.tsx b/frontend/pages/packs/ManagePacksPage/ManagePacksPage.tsx index 6c40672f66..feac5e715b 100644 --- a/frontend/pages/packs/ManagePacksPage/ManagePacksPage.tsx +++ b/frontend/pages/packs/ManagePacksPage/ManagePacksPage.tsx @@ -14,7 +14,7 @@ import Button from "components/buttons/Button"; import TableDataError from "components/DataError"; import Spinner from "components/Spinner"; import MainContent from "components/MainContent"; -import PacksListWrapper from "./components/PacksListWrapper"; +import PacksTable from "./components/PacksTable"; import DeletePackModal from "./components/DeletePackModal"; const baseClass = "manage-packs-page"; @@ -43,7 +43,7 @@ const renderTable = ( const isTableDataLoading = isLoadingPacks || packs === null; return ( - void; onEnablePackClick: (selectedTablePackIds: number[]) => void; onDisablePackClick: (selectedTablePackIds: number[]) => void; @@ -21,14 +21,14 @@ interface IPacksListWrapperProps { isLoading: boolean; } -const PacksListWrapper = ({ +const PacksTable = ({ onDeletePackClick, onEnablePackClick, onDisablePackClick, onCreatePackClick, packs, isLoading, -}: IPacksListWrapperProps): JSX.Element => { +}: IPacksTableProps): JSX.Element => { const [filteredPacks, setFilteredPacks] = useState( packs ); @@ -133,4 +133,4 @@ const PacksListWrapper = ({ ); }; -export default PacksListWrapper; +export default PacksTable; diff --git a/frontend/pages/packs/ManagePacksPage/components/PacksListWrapper/PacksTableConfig.tsx b/frontend/pages/packs/ManagePacksPage/components/PacksTable/PacksTableConfig.tsx similarity index 100% rename from frontend/pages/packs/ManagePacksPage/components/PacksListWrapper/PacksTableConfig.tsx rename to frontend/pages/packs/ManagePacksPage/components/PacksTable/PacksTableConfig.tsx diff --git a/frontend/pages/packs/ManagePacksPage/components/PacksListWrapper/_styles.scss b/frontend/pages/packs/ManagePacksPage/components/PacksTable/_styles.scss similarity index 98% rename from frontend/pages/packs/ManagePacksPage/components/PacksListWrapper/_styles.scss rename to frontend/pages/packs/ManagePacksPage/components/PacksTable/_styles.scss index 1c7336d6d0..61fe248da6 100644 --- a/frontend/pages/packs/ManagePacksPage/components/PacksListWrapper/_styles.scss +++ b/frontend/pages/packs/ManagePacksPage/components/PacksTable/_styles.scss @@ -1,4 +1,4 @@ -.packs-list-wrapper { +.packs-table { .data-table-block { .data-table__table { thead { diff --git a/frontend/pages/packs/ManagePacksPage/components/PacksTable/index.ts b/frontend/pages/packs/ManagePacksPage/components/PacksTable/index.ts new file mode 100644 index 0000000000..2e318eaf94 --- /dev/null +++ b/frontend/pages/packs/ManagePacksPage/components/PacksTable/index.ts @@ -0,0 +1 @@ +export { default } from "./PacksTable"; diff --git a/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx b/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx index 73903d8964..deb6c8a17a 100644 --- a/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx +++ b/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx @@ -25,7 +25,7 @@ import TeamsDropdown from "components/TeamsDropdown"; import TableDataError from "components/DataError"; import MainContent from "components/MainContent"; -import PoliciesListWrapper from "./components/PoliciesListWrapper"; +import PoliciesTable from "./components/PoliciesTable"; import ManageAutomationsModal from "./components/ManageAutomationsModal"; import AddPolicyModal from "./components/AddPolicyModal"; import DeletePoliciesModal from "./components/DeletePoliciesModal"; @@ -418,7 +418,7 @@ const ManagePolicyPage = ({ (isFetchingTeamPolicies ? ( ) : ( - ) : ( - ) : ( - void; @@ -33,7 +33,7 @@ interface IPoliciesListWrapperProps { currentAutomatedPolicies?: number[]; } -const PoliciesListWrapper = ({ +const PoliciesTable = ({ policiesList, isLoading, onAddPolicyClick, @@ -43,7 +43,7 @@ const PoliciesListWrapper = ({ tableType, currentTeam, currentAutomatedPolicies, -}: IPoliciesListWrapperProps): JSX.Element => { +}: IPoliciesTableProps): JSX.Element => { const { MANAGE_HOSTS } = paths; const { config } = useContext(AppContext); @@ -147,4 +147,4 @@ const PoliciesListWrapper = ({ ); }; -export default PoliciesListWrapper; +export default PoliciesTable; diff --git a/frontend/pages/policies/ManagePoliciesPage/components/PoliciesListWrapper/PoliciesTableConfig.tsx b/frontend/pages/policies/ManagePoliciesPage/components/PoliciesTable/PoliciesTableConfig.tsx similarity index 100% rename from frontend/pages/policies/ManagePoliciesPage/components/PoliciesListWrapper/PoliciesTableConfig.tsx rename to frontend/pages/policies/ManagePoliciesPage/components/PoliciesTable/PoliciesTableConfig.tsx diff --git a/frontend/pages/policies/ManagePoliciesPage/components/PoliciesListWrapper/_styles.scss b/frontend/pages/policies/ManagePoliciesPage/components/PoliciesTable/_styles.scss similarity index 98% rename from frontend/pages/policies/ManagePoliciesPage/components/PoliciesListWrapper/_styles.scss rename to frontend/pages/policies/ManagePoliciesPage/components/PoliciesTable/_styles.scss index ae50d0c608..52969b1f1d 100644 --- a/frontend/pages/policies/ManagePoliciesPage/components/PoliciesListWrapper/_styles.scss +++ b/frontend/pages/policies/ManagePoliciesPage/components/PoliciesTable/_styles.scss @@ -1,4 +1,4 @@ -.policies-list-wrapper { +.policies-table { border-collapse: collapse; a { diff --git a/frontend/pages/policies/ManagePoliciesPage/components/PoliciesTable/index.ts b/frontend/pages/policies/ManagePoliciesPage/components/PoliciesTable/index.ts new file mode 100644 index 0000000000..539c542396 --- /dev/null +++ b/frontend/pages/policies/ManagePoliciesPage/components/PoliciesTable/index.ts @@ -0,0 +1 @@ +export { default } from "./PoliciesTable"; diff --git a/frontend/pages/policies/PolicyPage/components/PolicyQueriesErrorsListWrapper/index.ts b/frontend/pages/policies/PolicyPage/components/PolicyQueriesErrorsListWrapper/index.ts deleted file mode 100644 index 1ea9e64757..0000000000 --- a/frontend/pages/policies/PolicyPage/components/PolicyQueriesErrorsListWrapper/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { default } from "./PolicyQueriesErrorsListWrapper"; diff --git a/frontend/pages/policies/PolicyPage/components/PolicyQueriesErrorsListWrapper/PolicyQueriesErrorsListWrapper.tsx b/frontend/pages/policies/PolicyPage/components/PolicyQueriesErrorsTable/PolicyQueriesErrorsTable.tsx similarity index 87% rename from frontend/pages/policies/PolicyPage/components/PolicyQueriesErrorsListWrapper/PolicyQueriesErrorsListWrapper.tsx rename to frontend/pages/policies/PolicyPage/components/PolicyQueriesErrorsTable/PolicyQueriesErrorsTable.tsx index fd5ec8cec9..99d437efc7 100644 --- a/frontend/pages/policies/PolicyPage/components/PolicyQueriesErrorsListWrapper/PolicyQueriesErrorsListWrapper.tsx +++ b/frontend/pages/policies/PolicyPage/components/PolicyQueriesErrorsTable/PolicyQueriesErrorsTable.tsx @@ -8,22 +8,22 @@ import { generateDataSet, } from "./PolicyQueriesErrorsTableConfig"; -const baseClass = "policies-queries-list-wrapper"; +const baseClass = "policies-queries-table"; const noPolicyQueries = "no-policy-queries"; -interface IPoliciesListWrapperProps { +interface IPoliciesTableProps { errorsList: ICampaignError[]; isLoading: boolean; resultsTitle?: string; canAddOrDeletePolicy?: boolean; } -const PoliciesListWrapper = ({ +const PoliciesTable = ({ errorsList, isLoading, resultsTitle, canAddOrDeletePolicy, -}: IPoliciesListWrapperProps): JSX.Element => { +}: IPoliciesTableProps): JSX.Element => { const NoPolicyQueries = () => { return (
@@ -60,4 +60,4 @@ const PoliciesListWrapper = ({ ); }; -export default PoliciesListWrapper; +export default PoliciesTable; diff --git a/frontend/pages/policies/PolicyPage/components/PolicyQueriesErrorsListWrapper/PolicyQueriesErrorsTableConfig.tsx b/frontend/pages/policies/PolicyPage/components/PolicyQueriesErrorsTable/PolicyQueriesErrorsTableConfig.tsx similarity index 100% rename from frontend/pages/policies/PolicyPage/components/PolicyQueriesErrorsListWrapper/PolicyQueriesErrorsTableConfig.tsx rename to frontend/pages/policies/PolicyPage/components/PolicyQueriesErrorsTable/PolicyQueriesErrorsTableConfig.tsx diff --git a/frontend/pages/policies/PolicyPage/components/PolicyQueriesErrorsListWrapper/_styles.scss b/frontend/pages/policies/PolicyPage/components/PolicyQueriesErrorsTable/_styles.scss similarity index 98% rename from frontend/pages/policies/PolicyPage/components/PolicyQueriesErrorsListWrapper/_styles.scss rename to frontend/pages/policies/PolicyPage/components/PolicyQueriesErrorsTable/_styles.scss index df533a4bf6..9a307b5fb4 100644 --- a/frontend/pages/policies/PolicyPage/components/PolicyQueriesErrorsListWrapper/_styles.scss +++ b/frontend/pages/policies/PolicyPage/components/PolicyQueriesErrorsTable/_styles.scss @@ -1,4 +1,4 @@ -.policies-queries-list-wrapper { +.policies-queries-table { border-collapse: collapse; a { diff --git a/frontend/pages/policies/PolicyPage/components/PolicyQueriesErrorsTable/index.ts b/frontend/pages/policies/PolicyPage/components/PolicyQueriesErrorsTable/index.ts new file mode 100644 index 0000000000..9b51be9010 --- /dev/null +++ b/frontend/pages/policies/PolicyPage/components/PolicyQueriesErrorsTable/index.ts @@ -0,0 +1 @@ +export { default } from "./PolicyQueriesErrorsTable"; diff --git a/frontend/pages/policies/PolicyPage/components/PolicyQueriesListWrapper/index.ts b/frontend/pages/policies/PolicyPage/components/PolicyQueriesListWrapper/index.ts deleted file mode 100644 index ba92ba90e6..0000000000 --- a/frontend/pages/policies/PolicyPage/components/PolicyQueriesListWrapper/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { default } from "./PolicyQueriesListWrapper"; diff --git a/frontend/pages/policies/PolicyPage/components/PolicyQueriesListWrapper/PolicyQueriesListWrapper.tsx b/frontend/pages/policies/PolicyPage/components/PolicyQueriesTable/PolicyQueriesTable.tsx similarity index 87% rename from frontend/pages/policies/PolicyPage/components/PolicyQueriesListWrapper/PolicyQueriesListWrapper.tsx rename to frontend/pages/policies/PolicyPage/components/PolicyQueriesTable/PolicyQueriesTable.tsx index 7017fc8133..980dba020f 100644 --- a/frontend/pages/policies/PolicyPage/components/PolicyQueriesListWrapper/PolicyQueriesListWrapper.tsx +++ b/frontend/pages/policies/PolicyPage/components/PolicyQueriesTable/PolicyQueriesTable.tsx @@ -8,22 +8,22 @@ import { generateDataSet, } from "./PolicyQueriesTableConfig"; -const baseClass = "policies-queries-list-wrapper"; +const baseClass = "policies-queries-table"; const noPolicyQueries = "no-policy-queries"; -interface IPoliciesListWrapperProps { +interface IPoliciesTableProps { policyHostsList: IHostPolicyQuery[]; isLoading: boolean; resultsTitle?: string; canAddOrDeletePolicy?: boolean; } -const PoliciesListWrapper = ({ +const PoliciesTable = ({ policyHostsList, isLoading, resultsTitle, canAddOrDeletePolicy, -}: IPoliciesListWrapperProps): JSX.Element => { +}: IPoliciesTableProps): JSX.Element => { const NoPolicyQueries = () => { return (
@@ -59,4 +59,4 @@ const PoliciesListWrapper = ({ ); }; -export default PoliciesListWrapper; +export default PoliciesTable; diff --git a/frontend/pages/policies/PolicyPage/components/PolicyQueriesListWrapper/PolicyQueriesTableConfig.tsx b/frontend/pages/policies/PolicyPage/components/PolicyQueriesTable/PolicyQueriesTableConfig.tsx similarity index 100% rename from frontend/pages/policies/PolicyPage/components/PolicyQueriesListWrapper/PolicyQueriesTableConfig.tsx rename to frontend/pages/policies/PolicyPage/components/PolicyQueriesTable/PolicyQueriesTableConfig.tsx diff --git a/frontend/pages/policies/PolicyPage/components/PolicyQueriesListWrapper/_styles.scss b/frontend/pages/policies/PolicyPage/components/PolicyQueriesTable/_styles.scss similarity index 98% rename from frontend/pages/policies/PolicyPage/components/PolicyQueriesListWrapper/_styles.scss rename to frontend/pages/policies/PolicyPage/components/PolicyQueriesTable/_styles.scss index eae3420dda..9ec4c1a889 100644 --- a/frontend/pages/policies/PolicyPage/components/PolicyQueriesListWrapper/_styles.scss +++ b/frontend/pages/policies/PolicyPage/components/PolicyQueriesTable/_styles.scss @@ -1,4 +1,4 @@ -.policies-queries-list-wrapper { +.policies-queries-table { border-collapse: collapse; a { diff --git a/frontend/pages/policies/PolicyPage/components/PolicyQueriesTable/index.ts b/frontend/pages/policies/PolicyPage/components/PolicyQueriesTable/index.ts new file mode 100644 index 0000000000..87b478a29f --- /dev/null +++ b/frontend/pages/policies/PolicyPage/components/PolicyQueriesTable/index.ts @@ -0,0 +1 @@ +export { default } from "./PolicyQueriesTable"; diff --git a/frontend/pages/policies/PolicyPage/components/QueryResults/QueryResults.tsx b/frontend/pages/policies/PolicyPage/components/QueryResults/QueryResults.tsx index 0fb79a55f0..5e50a09fd3 100644 --- a/frontend/pages/policies/PolicyPage/components/QueryResults/QueryResults.tsx +++ b/frontend/pages/policies/PolicyPage/components/QueryResults/QueryResults.tsx @@ -14,8 +14,8 @@ import Spinner from "components/Spinner"; import TabsWrapper from "components/TabsWrapper"; import InfoBanner from "components/InfoBanner"; import TooltipWrapper from "components/TooltipWrapper"; -import PolicyQueryListWrapper from "../PolicyQueriesListWrapper/PolicyQueriesListWrapper"; -import PolicyQueriesErrorsListWrapper from "../PolicyQueriesErrorsListWrapper/PolicyQueriesErrorsListWrapper"; +import PolicyQueryTable from "../PolicyQueriesTable/PolicyQueriesTable"; +import PolicyQueriesErrorsTable from "../PolicyQueriesErrorsTable/PolicyQueriesErrorsTable"; import DownloadIcon from "../../../../../../assets/images/icon-download-12x12@2x.png"; @@ -174,7 +174,7 @@ const QueryResults = ({
- - ) : ( - void; @@ -28,7 +28,7 @@ interface IQueriesListWrapperProps { isOnlyObserver?: boolean; } -const QueriesListWrapper = ({ +const QueriesTable = ({ queriesList, isLoading, onDeleteQueryClick, @@ -37,7 +37,7 @@ const QueriesListWrapper = ({ customControl, selectedDropdownFilter, isOnlyObserver, -}: IQueriesListWrapperProps): JSX.Element | null => { +}: IQueriesTableProps): JSX.Element | null => { const { currentUser } = useContext(AppContext); const [searchString, setSearchString] = useState(""); @@ -139,4 +139,4 @@ const QueriesListWrapper = ({ ) : null; }; -export default QueriesListWrapper; +export default QueriesTable; diff --git a/frontend/pages/queries/ManageQueriesPage/components/QueriesListWrapper/QueriesTableConfig.tsx b/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/QueriesTableConfig.tsx similarity index 100% rename from frontend/pages/queries/ManageQueriesPage/components/QueriesListWrapper/QueriesTableConfig.tsx rename to frontend/pages/queries/ManageQueriesPage/components/QueriesTable/QueriesTableConfig.tsx diff --git a/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/index.ts b/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/index.ts new file mode 100644 index 0000000000..361611c87d --- /dev/null +++ b/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/index.ts @@ -0,0 +1 @@ +export { default } from "./QueriesTable"; diff --git a/frontend/pages/schedule/ManageSchedulePage/ManageSchedulePage.tsx b/frontend/pages/schedule/ManageSchedulePage/ManageSchedulePage.tsx index df6022ed0d..02e91fafdb 100644 --- a/frontend/pages/schedule/ManageSchedulePage/ManageSchedulePage.tsx +++ b/frontend/pages/schedule/ManageSchedulePage/ManageSchedulePage.tsx @@ -29,7 +29,7 @@ import Spinner from "components/Spinner"; import TeamsDropdown from "components/TeamsDropdown"; import TableDataError from "components/DataError"; import MainContent from "components/MainContent"; -import ScheduleListWrapper from "./components/ScheduleListWrapper"; +import ScheduleTable from "./components/ScheduleTable"; import ScheduleEditorModal from "./components/ScheduleEditorModal"; import RemoveScheduledQueryModal from "./components/RemoveScheduledQueryModal"; @@ -55,7 +55,7 @@ const renderTable = ( return allScheduledQueriesError || errorQueries ? ( ) : ( - ) : (
- void; onEditScheduledQueryClick?: (selectedQuery: IEditScheduledQuery) => void; @@ -42,7 +42,7 @@ interface IScheduleListWrapperProps { loadingTeamQueriesTableData: boolean; } -const ScheduleListWrapper = ({ +const ScheduleTable = ({ router, onRemoveScheduledQueryClick, allScheduledQueriesList, @@ -53,7 +53,7 @@ const ScheduleListWrapper = ({ selectedTeamData, loadingInheritedQueriesTableData, loadingTeamQueriesTableData, -}: IScheduleListWrapperProps): JSX.Element => { +}: IScheduleTableProps): JSX.Element => { const { MANAGE_PACKS, MANAGE_HOSTS } = paths; const handleAdvanced = () => router.push(MANAGE_PACKS); @@ -186,12 +186,12 @@ const ScheduleListWrapper = ({ disablePagination onPrimarySelectActionClick={onRemoveScheduledQueryClick} primarySelectActionButtonVariant="text-icon" - primarySelectActionButtonIcon="delete" - primarySelectActionButtonText={"Delete"} + primarySelectActionButtonIcon="remove" + primarySelectActionButtonText={"Remove"} emptyComponent={NoScheduledQueries} />
); }; -export default ScheduleListWrapper; +export default ScheduleTable; diff --git a/frontend/pages/schedule/ManageSchedulePage/components/ScheduleListWrapper/ScheduleTableConfig.tsx b/frontend/pages/schedule/ManageSchedulePage/components/ScheduleTable/ScheduleTableConfig.tsx similarity index 100% rename from frontend/pages/schedule/ManageSchedulePage/components/ScheduleListWrapper/ScheduleTableConfig.tsx rename to frontend/pages/schedule/ManageSchedulePage/components/ScheduleTable/ScheduleTableConfig.tsx diff --git a/frontend/pages/schedule/ManageSchedulePage/components/ScheduleTable/index.ts b/frontend/pages/schedule/ManageSchedulePage/components/ScheduleTable/index.ts new file mode 100644 index 0000000000..fb4310e446 --- /dev/null +++ b/frontend/pages/schedule/ManageSchedulePage/components/ScheduleTable/index.ts @@ -0,0 +1 @@ +export { default } from "./ScheduleTable";