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

Switch over to use object roles on billing #902

Closed
wants to merge 4 commits into from
Closed

Switch over to use object roles on billing #902

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
1e8ee30
Switch over to use object roles on billing
travjenkins Dec 22, 2023
66d56fa
Merge branch 'main' into travjenkins/billing/useObjectRoles
travjenkins Dec 22, 2023
2ab0f72
Merge branch 'main' into travjenkins/billing/useObjectRoles
travjenkins Jan 2, 2024
377d8c5
Merge branch 'main' into travjenkins/billing/useObjectRoles
travjenkins Jan 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
12 changes: 5 additions & 7 deletions src/components/admin/Billing/TenantOptions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Skeleton } from '@mui/material';
import AutocompletedField from 'components/shared/toolbar/AutocompletedField';
import { useTenantDetails } from 'context/fetcher/Tenant';
import { useZustandStore } from 'context/Zustand/provider';
import useGlobalSearchParams, {
GlobalSearchParams,
Expand All @@ -12,6 +11,7 @@ import {
useBilling_resetState,
useBilling_setSelectedTenant,
} from 'stores/Billing/hooks';
import { useEntitiesStore_capabilities_adminable } from 'stores/Entities/hooks';
import { SelectTableStoreNames } from 'stores/names';
import {
useBillingTable_setHydrated,
Expand All @@ -26,7 +26,8 @@ import { hasLength } from 'utils/misc-utils';
function TenantOptions() {
const intl = useIntl();

const tenants = useTenantDetails();
const adminCapabilities = useEntitiesStore_capabilities_adminable();
const objectRoles = Object.keys(adminCapabilities);

// AutoComplete
const handledDefault = useRef(false);
Expand All @@ -51,11 +52,8 @@ function TenantOptions() {
>(SelectTableStoreNames.BILLING, selectableTableStoreSelectors.state.reset);

const tenantNames = useMemo<string[] | null>(
() =>
tenants && tenants.length > 0
? tenants.map(({ tenant }) => tenant)
: null,
[tenants]
() => (objectRoles.length > 0 ? objectRoles : null),
[objectRoles]
);

const updateStateAndStore = useCallback(
Expand Down
13 changes: 9 additions & 4 deletions src/components/admin/Tabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
import { Box, Tab, Tabs } from '@mui/material';
import { authenticatedRoutes } from 'app/routes';
import { useTenantDetails } from 'context/fetcher/Tenant';
import { useMemo, useState } from 'react';
import { useIntl } from 'react-intl';
import { Link, useLocation } from 'react-router-dom';
import { useEntitiesStore_capabilities_adminable } from 'stores/Entities/hooks';
import { hasLength } from 'utils/misc-utils';

function AdminTabs() {
const intl = useIntl();
const { pathname } = useLocation();
const [selectedTab, setSelectedTab] = useState(0);
const tenantDetails = useTenantDetails();

const adminCapabilities = useEntitiesStore_capabilities_adminable();
const hasAdmin = useMemo(
() => hasLength(Object.keys(adminCapabilities)),
[adminCapabilities]
);

const tabProps = useMemo(() => {
const response = [
Expand All @@ -24,7 +29,7 @@ function AdminTabs() {
},
];

if (hasLength(tenantDetails)) {
if (hasAdmin) {
response.push({
label: 'admin.tabs.billing',
path: authenticatedRoutes.admin.billing.fullPath,
Expand All @@ -41,7 +46,7 @@ function AdminTabs() {
path: authenticatedRoutes.admin.api.fullPath,
},
]);
}, [tenantDetails]);
}, [hasAdmin]);

const tabs = useMemo(
() =>
Expand Down