Skip to content

chore(greenhouse): make admin area toolbar consistent across tabs #1767

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

Open
guoda-puidokaite wants to merge 5 commits into
base: main
Choose a base branch
from
Open

chore(greenhouse): make admin area toolbar consistent across tabs #1767

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
766f0ac
make the datagridtoolbar consistent across all admin tabs
guoda-puidokaite Jun 16, 2026
9321e04
make the datagridtoolbar consistent across all admin tabs
guoda-puidokaite Jun 16, 2026
9c45567
changeset
guoda-puidokaite Jun 16, 2026
589795d
tidy up
guoda-puidokaite Jun 17, 2026
d02e66f
Merge branch 'main' into guoda-gh-admin-toolbar-consistency
guoda-puidokaite Jun 17, 2026
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
36 changes: 19 additions & 17 deletions apps/greenhouse/src/components/admin/Clusters/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import React, { useState } from "react"
import { useRouteContext, useSearch } from "@tanstack/react-router"
import { useIsFetching, useQuery, useQueryClient } from "@tanstack/react-query"
import { Container, ContentHeading, Button, Stack } from "@cloudoperators/juno-ui-components"
import { Container, ContentHeading, Button, Stack, DataGridToolbar } from "@cloudoperators/juno-ui-components"

import { ClustersDataGrid } from "./ClustersGrid"
import { ClustersFilters } from "./ClustersFilters"
Expand Down Expand Up @@ -43,23 +43,25 @@ export const Clusters = () => {
</Container>
<Container px={false} py>
<ClustersFilters />
<Stack alignment="center" className="bg-theme-background-lvl-1 py-1.5 px-4 my-px text-theme-light">
<div>
<span className="text-theme-default pr-2">{`${total} clusters`}</span>
<span>{`(${ready} ready, ${notReady} not ready)`}</span>
</div>
<Stack alignment="center" className="ml-auto">
{lastUpdatedAt && `Last update: ${new Date(lastUpdatedAt).toLocaleString()}`}
<Button
size="small"
label={isFetching > 0 ? "Loading..." : "Refresh"}
className="ml-4 min-w-[90px]"
onClick={handleRefresh}
variant="subdued"
disabled={isFetching > 0}
/>
<DataGridToolbar>
<Stack alignment="center" className="bg-theme-background-lvl-1 py-1.5 px-4 my-px text-theme-light">
<div>
Comment thread
guoda-puidokaite marked this conversation as resolved.
Outdated
<span className="text-theme-default pr-2">{`${total} clusters`}</span>
<span>{`(${ready} ready, ${notReady} not ready)`}</span>
</div>
<Stack alignment="center" className="ml-auto">
{lastUpdatedAt && `Last update: ${new Date(lastUpdatedAt).toLocaleString()}`}
<Button
size="small"
label={isFetching > 0 ? "Loading..." : "Refresh"}
className="ml-4 min-w-[90px]"
onClick={handleRefresh}
variant="subdued"
disabled={isFetching > 0}
/>
</Stack>
</Stack>
</Stack>
</DataGridToolbar>
<ClustersDataGrid />
</Container>
</>
Expand Down
2 changes: 1 addition & 1 deletion apps/greenhouse/src/components/admin/ExposedServices/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const ExposedServices = () => {
<Container px={false} py>
<ExposedServicesFilters />
<DataGridToolbar>
<Stack>
<Stack alignment="center" className="bg-theme-background-lvl-1 py-1.5 px-4 my-px text-theme-light">
Comment thread
guoda-puidokaite marked this conversation as resolved.
Outdated
<div>
<span className="text-theme-default pr-2">{`${total} exposed services`}</span>
</div>
Expand Down
65 changes: 33 additions & 32 deletions apps/greenhouse/src/components/admin/PluginPresets/PluginPresetsFilters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { useLoaderData, useNavigate, useRouteContext } from "@tanstack/react-rou
import { FilterSettings, SelectedFilter } from "../common/types"
import { getFiltersForUrl } from "../utils"
import { SELECTED_FILTER_PREFIX } from "../constants"
import { Stack, InputGroup, Button, SearchInput } from "@cloudoperators/juno-ui-components/index"
import { Stack, Button, SearchInput } from "@cloudoperators/juno-ui-components/index"
import { SelectedFilters } from "../common/SelectedFilters"
import { useQuery } from "@tanstack/react-query"
import {
Expand Down Expand Up @@ -68,38 +68,25 @@ export const PluginPresetsFilters = () => {
return (
<Stack direction="vertical" gap="4" className="bg-theme-background-lvl-1 py-2 px-4 mb-px">
<Stack alignment="start" gap="4">
<InputGroup>
<FilterSelect
filters={filters}
isLoading={isLoading}
error={error}
onChange={(selectedFilter: SelectedFilter) => {
const filterExists = filterSettings.selectedFilters?.some(
(filter) => filter.id === selectedFilter.id && filter.value === selectedFilter.value
)
//only add the filter if it does not already exist
if (!filterExists) {
updateFilters({
...filterSettings,
selectedFilters: [...(filterSettings.selectedFilters || []), selectedFilter],
})
}
}}
/>
</InputGroup>
<Button
label="Clear all"
className="ml-4"
onClick={() =>
updateFilters({
...filterSettings,
selectedFilters: [],
})
}
variant="subdued"
<FilterSelect
filters={filters}
isLoading={isLoading}
error={error}
onChange={(selectedFilter: SelectedFilter) => {
const filterExists = filterSettings.selectedFilters?.some(
(filter) => filter.id === selectedFilter.id && filter.value === selectedFilter.value
)
//only add the filter if it does not already exist
if (!filterExists) {
updateFilters({
...filterSettings,
selectedFilters: [...(filterSettings.selectedFilters || []), selectedFilter],
})
}
}}
/>
<SearchInput
placeholder={`search term for PluginPresets name`}
placeholder={`search term for PluginPreset name`}
className="w-96 ml-auto"
data-testid="searchbar"
value={filterSettings.searchTerm}
Expand All @@ -118,7 +105,21 @@ export const PluginPresetsFilters = () => {
/>
</Stack>
{filterSettings.selectedFilters && filterSettings.selectedFilters.length > 0 && (
<SelectedFilters selectedFilters={filterSettings.selectedFilters} onDelete={handleFilterDelete} />
<Stack>
<SelectedFilters selectedFilters={filterSettings.selectedFilters} onDelete={handleFilterDelete} />
<Button
size="xs"
label="Clear all"
className="ml-4"
onClick={() =>
updateFilters({
...filterSettings,
selectedFilters: [],
})
}
variant="subdued"
/>
</Stack>
)}
</Stack>
)
Expand Down
2 changes: 1 addition & 1 deletion apps/greenhouse/src/components/admin/PluginPresets/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export const PluginPresets = () => {
<Container px={false} py>
<PluginPresetsFilters />
<DataGridToolbar>
<Stack>
<Stack alignment="center" className="bg-theme-background-lvl-1 py-1.5 px-4 my-px text-theme-light">
Comment thread
guoda-puidokaite marked this conversation as resolved.
Outdated
<div>
<span className="text-theme-default pr-2">{`${total} PluginPresets`}</span>
<span>{`(${ready} ready, ${notReady} not ready)`}</span>
Expand Down
Loading