Skip to content

Commit 0f3d776

Browse files
MartinSchoelerMartinSchoeler
committed
chore: merge fixes
1 parent 94e3da0 commit 0f3d776

File tree

8 files changed

+35
-38
lines changed

8 files changed

+35
-38
lines changed

‎apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesPage.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
import { Box, Button, Icon, Margins, Pagination, TextInput } from '@rocket.chat/fuselage';
22
import { useDebouncedValue, useEffectEvent } from '@rocket.chat/fuselage-hooks';
3-
import { useEndpoint, useRouter } from '@rocket.chat/ui-contexts';
4-
import { useQuery } from '@tanstack/react-query';
5-
import { useMemo, useState } from 'react';
6-
import { useTranslation } from 'react-i18next';
7-
8-
import AttributeMenu from './AttributeMenu';
9-
import GenericNoResults from '../../../../components/GenericNoResults';
103
import {
114
GenericTable,
125
GenericTableBody,
136
GenericTableCell,
147
GenericTableHeader,
158
GenericTableHeaderCell,
169
GenericTableRow,
17-
} from '../../../../components/GenericTable';
18-
import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
10+
usePagination,
11+
} from '@rocket.chat/ui-client';
12+
import { useEndpoint, useRouter } from '@rocket.chat/ui-contexts';
13+
import { useQuery } from '@tanstack/react-query';
14+
import { useMemo, useState } from 'react';
15+
import { useTranslation } from 'react-i18next';
16+
17+
import AttributeMenu from './AttributeMenu';
18+
import GenericNoResults from '../../../../components/GenericNoResults';
1919
import { ABACQueryKeys } from '../../../../lib/queryKeys';
2020
import { useIsABACAvailable } from '../hooks/useIsABACAvailable';
2121

‎apps/meteor/client/views/admin/ABAC/ABACAttributesTab/__snapshots__/AttributesForm.spec.tsx.snap‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ exports[`AttributesForm renders NewAttribute without crashing 1`] = `
1010
class="rcx-box rcx-box--full rcx-css-1svuzur"
1111
>
1212
<div
13-
class="rcx-box rcx-box--full rcx-css-pln26h rcx-css-1cb6i7s"
13+
class="rcx-box rcx-box--full rcx-css-vlo1oi rcx-css-1cb6i7s"
1414
data-overlayscrollbars="host"
1515
>
1616
<div
17-
class="rcx-box rcx-box--full rcx-css-vlo1oi rcx-css-1cb6i7s"
18-
data-overlayscrollbars="host"
17+
class="os-size-observer"
1918
>
2019
<div
2120
class="os-size-observer-listener"
@@ -179,12 +178,11 @@ exports[`AttributesForm renders WithLockedAttributes without crashing 1`] = `
179178
class="rcx-box rcx-box--full rcx-css-1svuzur"
180179
>
181180
<div
182-
class="rcx-box rcx-box--full rcx-css-pln26h rcx-css-1cb6i7s"
181+
class="rcx-box rcx-box--full rcx-css-vlo1oi rcx-css-1cb6i7s"
183182
data-overlayscrollbars="host"
184183
>
185184
<div
186-
class="rcx-box rcx-box--full rcx-css-vlo1oi rcx-css-1cb6i7s"
187-
data-overlayscrollbars="host"
185+
class="os-size-observer"
188186
>
189187
<div
190188
class="os-size-observer-listener"

‎apps/meteor/client/views/admin/ABAC/ABACLogsTab/LogsPage.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
import type { AbacAttributeDefinitionChangeType, AbacActionPerformed } from '@rocket.chat/core-typings';
22
import { Box, InputBox, Margins, Pagination } from '@rocket.chat/fuselage';
33
import { UserAvatar } from '@rocket.chat/ui-avatar';
4-
import { useEndpoint } from '@rocket.chat/ui-contexts';
5-
import { useQuery } from '@tanstack/react-query';
6-
import { useMemo, useEffect, useState } from 'react';
7-
import { useTranslation } from 'react-i18next';
8-
9-
import GenericNoResults from '../../../../components/GenericNoResults';
104
import {
115
GenericTable,
126
GenericTableBody,
137
GenericTableCell,
148
GenericTableHeader,
159
GenericTableHeaderCell,
1610
GenericTableRow,
17-
} from '../../../../components/GenericTable';
18-
import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
11+
usePagination,
12+
} from '@rocket.chat/ui-client';
13+
import { useEndpoint } from '@rocket.chat/ui-contexts';
14+
import { useQuery } from '@tanstack/react-query';
15+
import { useMemo, useEffect, useState } from 'react';
16+
import { useTranslation } from 'react-i18next';
17+
18+
import GenericNoResults from '../../../../components/GenericNoResults';
1919
import { useFormatDateAndTime } from '../../../../hooks/useFormatDateAndTime';
2020
import { ABACQueryKeys } from '../../../../lib/queryKeys';
2121
import DateRangePicker from '../../moderation/helpers/DateRangePicker';

‎apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomsPage.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
import { Box, Button, Icon, Margins, Pagination, Select, TextInput } from '@rocket.chat/fuselage';
22
import { useDebouncedValue, useEffectEvent } from '@rocket.chat/fuselage-hooks';
3-
import { useEndpoint, useRouter } from '@rocket.chat/ui-contexts';
4-
import { useQuery } from '@tanstack/react-query';
5-
import { useMemo, useState, useEffect } from 'react';
6-
import { useTranslation } from 'react-i18next';
7-
8-
import RoomMenu from './RoomMenu';
9-
import GenericNoResults from '../../../../components/GenericNoResults';
103
import {
114
GenericTable,
125
GenericTableBody,
136
GenericTableCell,
147
GenericTableHeader,
158
GenericTableHeaderCell,
169
GenericTableRow,
17-
} from '../../../../components/GenericTable';
18-
import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
10+
usePagination,
11+
} from '@rocket.chat/ui-client';
12+
import { useEndpoint, useRouter } from '@rocket.chat/ui-contexts';
13+
import { useQuery } from '@tanstack/react-query';
14+
import { useMemo, useState, useEffect } from 'react';
15+
import { useTranslation } from 'react-i18next';
16+
17+
import RoomMenu from './RoomMenu';
18+
import GenericNoResults from '../../../../components/GenericNoResults';
1919
import { ABACQueryKeys } from '../../../../lib/queryKeys';
2020
import { useIsABACAvailable } from '../hooks/useIsABACAvailable';
2121

‎apps/meteor/client/views/admin/ABAC/ABACRoomsTab/__snapshots__/DeleteRoomModal.spec.tsx.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ exports[`DeleteRoomModal should render without crashing 1`] = `
1010
open=""
1111
>
1212
<div
13-
class="rcx-box rcx-box--full rcx-modal__inner rcx-css-1e2ego0"
13+
class="rcx-box rcx-box--full rcx-modal__inner rcx-css-1euli2f"
1414
>
1515
<header
1616
class="rcx-box rcx-box--full rcx-modal__header"

‎apps/meteor/client/views/admin/ABAC/ABACRoomsTab/__snapshots__/RoomFormAttributeField.spec.tsx.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ exports[`RoomFormAttributeField renders Default without crashing 1`] = `
2020
class="rcx-box rcx-box--full rcx-select__wrapper--hidden rcx-select__wrapper rcx-css-bpb89k"
2121
>
2222
<span
23-
class="rcx-box rcx-box--full rcx-select__item rcx-css-jmdrnf"
23+
class="rcx-box rcx-box--full rcx-select__item rcx-css-4wu0oz"
2424
>
2525
ABAC_Search_Attribute
2626
</span>
@@ -58,7 +58,7 @@ exports[`RoomFormAttributeField renders Default without crashing 1`] = `
5858
>
5959
<button
6060
aria-haspopup="listbox"
61-
class="rcx-box rcx-box--full rcx-input-box--undecorated rcx-select__focus rcx-css-trljwa rcx-css-11drhl5"
61+
class="rcx-box rcx-box--full rcx-input-box--undecorated rcx-select__focus rcx-css-trljwa rcx-css-3fq6z9"
6262
type="button"
6363
>
6464
ABAC_Select_Attribute_Values

‎apps/meteor/client/views/admin/ABAC/ABACRoomsTab/__snapshots__/RoomFormAutocomplete.spec.tsx.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ exports[`RoomFormAutocomplete renders Default without crashing 1`] = `
2020
>
2121
<i
2222
aria-hidden="true"
23-
class="rcx-box rcx-box--full rcx-icon--name-magnifier rcx-icon rcx-css-6vi44e"
23+
class="rcx-box rcx-box--full rcx-icon--name-magnifier rcx-icon rcx-css-1wz6xj9"
2424
>
2525
2626
</i>

‎apps/meteor/client/views/admin/ABAC/AdminABACPage.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Box, Button, Callout } from '@rocket.chat/fuselage';
22
import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
3-
import { ContextualbarDialog } from '@rocket.chat/ui-client';
3+
import { ContextualbarDialog, Page, PageContent, PageHeader } from '@rocket.chat/ui-client';
44
import { useRouteParameter, useRouter } from '@rocket.chat/ui-contexts';
55
import { Trans, useTranslation } from 'react-i18next';
66

@@ -14,7 +14,6 @@ import RoomsPage from './ABACRoomsTab/RoomsPage';
1414
import SettingsPage from './ABACSettingTab/SettingsPage';
1515
import AdminABACTabs from './AdminABACTabs';
1616
import { useIsABACAvailable } from './hooks/useIsABACAvailable';
17-
import { Page, PageContent, PageHeader } from '../../../components/Page';
1817
import { useExternalLink } from '../../../hooks/useExternalLink';
1918
import { links } from '../../../lib/links';
2019

0 commit comments

Comments
 (0)