Skip to content

fix: useHasLicenseModule return change #37596

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

Merged
KevLehman merged 1 commit into from
Nov 24, 2025
Merged

fix: useHasLicenseModule return change #37596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions apps/meteor/client/views/admin/ABAC/AdminABACPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import AdminABACTabs from './AdminABACTabs';
import RoomAttributesContextualBar from './RoomAttributesContextualBar';
import RoomAttributesContextualBarWithData from './RoomAttributesContextualBarWithData';
import useIsABACAvailable from './hooks/useIsABACAvailable';
import { ContextualbarDialog, ContextualbarSkeletonBody } from '../../../components/Contextualbar';
import { ContextualbarDialog } from '../../../components/Contextualbar';
import { Page, PageContent, PageHeader } from '../../../components/Page';
import { useExternalLink } from '../../../hooks/useExternalLink';
import { links } from '../../../lib/links';
Expand Down Expand Up @@ -69,9 +69,8 @@ const AdminABACPage = ({ shouldShowWarning }: AdminABACPageProps) => {
</Page>
{tab === 'room-attributes' && context !== undefined && (
<ContextualbarDialog onClose={() => handleCloseContextualbar()}>
{isABACAvailable === 'loading' && <ContextualbarSkeletonBody />}
{context === 'new' && isABACAvailable === true && <RoomAttributesContextualBar onClose={() => handleCloseContextualbar()} />}
{context === 'edit' && _id && isABACAvailable === true && (
{context === 'new' && isABACAvailable && <RoomAttributesContextualBar onClose={() => handleCloseContextualbar()} />}
{context === 'edit' && _id && isABACAvailable && (
<RoomAttributesContextualBarWithData id={_id} onClose={() => handleCloseContextualbar()} />
)}
</ContextualbarDialog>
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/admin/ABAC/AdminABACRoomAttributes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const AdminABACRoomAttributes = () => {
value={text}
onChange={(e) => setText((e.target as HTMLInputElement).value)}
/>
<Button onClick={handleNewAttribute} primary mis={8} disabled={isABACAvailable !== true}>
<Button onClick={handleNewAttribute} primary mis={8} disabled={!isABACAvailable}>
{t('ABAC_New_attribute')}
</Button>
</Box>
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/admin/ABAC/AdminABACRoute.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const AdminABACRoute = (): ReactElement => {
const { t } = useTranslation();
// TODO: Check what permission is needed to view the ABAC page
const canViewABACPage = usePermission('abac-management');
const hasABAC = useHasLicenseModule('abac') === true;
const { data: hasABAC = false } = useHasLicenseModule('abac');
const isModalOpen = !!useCurrentModal();
const tab = useRouteParameter('tab');
const router = useRouter();
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/admin/ABAC/AdminABACSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
import { links } from '../../../lib/links';

const AdminABACSettings = () => {
const hasABAC = useHasLicenseModule('abac');
const { data: hasABAC = false } = useHasLicenseModule('abac');
return (
<Box maxWidth='x600' w='full' alignSelf='center'>
<Box>
Expand Down
5 changes: 3 additions & 2 deletions apps/meteor/client/views/admin/ABAC/hooks/useIsABACAvailable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ import { useSetting } from '@rocket.chat/ui-contexts';
import { useHasLicenseModule } from '../../../../hooks/useHasLicenseModule';

const useIsABACAvailable = () => {
const hasABAC = useHasLicenseModule('abac');
const { data: hasABAC = false } = useHasLicenseModule('abac');
const isABACSettingEnabled = useSetting('ABAC_Enabled', false);
return hasABAC === 'loading' ? 'loading' : hasABAC && isABACSettingEnabled;

return hasABAC && isABACSettingEnabled;
};

export default useIsABACAvailable;
2 changes: 1 addition & 1 deletion apps/meteor/client/views/admin/ABAC/useRoomAttributeOptions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ const useRoomAttributeItems = (attribute: { _id: string; key: string }): Generic
});

return [
{ id: 'edit', icon: 'edit' as const, content: t('Edit'), onClick: () => editAction(), disabled: isABACAvailable !== true },
{ id: 'edit', icon: 'edit' as const, content: t('Edit'), onClick: () => editAction(), disabled: !isABACAvailable },
{
id: 'delete',
iconColor: 'danger',
Expand Down
Loading