Skip to content

Commit ef52497

Browse files
BourqueCharlesBourqueCharles
authored
Merge pull request #170 from Telecominfraproject/main
Version 2.9.0(23)
2 parents 975b715 + 039e641 commit ef52497

File tree

52 files changed

+753
-285
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+753
-285
lines changed

‎package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "ucentral-client",
3-
"version": "2.9.0(13)",
3+
"version": "2.9.0(23)",
44
"description": "",
55
"private": true,
66
"main": "index.tsx",
77
"scripts": {
88
"dev": "vite",
99
"build": "vite build",
10-
"format": "prettier --write \"src/**/*.js\"",
10+
"format": "prettier --write \"src/**/*x.{ts,tsx,js,jsx}\"",
1111
"analyze": "source-map-explorer 'build/static/js/*.js'",
1212
"lint": "TIMING=1 eslint \"src/**/*.{ts,tsx,js,jsx}\" --fix",
1313
"clean": "rm -rf node_modules && rm -rf build"

‎src/components/Buttons/AlertButton/index.tsx

+8-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,14 @@ export interface AlertButtonProps extends ThemeProps {
1212
label?: string;
1313
}
1414

15-
const _AlertButton: React.FC<AlertButtonProps> = ({ onClick, isDisabled, isLoading, isCompact, label, ...props }) => {
15+
const _AlertButton: React.FC<AlertButtonProps> = ({
16+
onClick,
17+
isDisabled,
18+
isLoading,
19+
isCompact = true,
20+
label,
21+
...props
22+
}) => {
1623
const { t } = useTranslation();
1724
const breakpoint = useBreakpoint();
1825

‎src/components/Buttons/CreateButton/index.tsx

+8-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,14 @@ export interface CreateButtonProps extends SpaceProps {
1111
label?: string;
1212
}
1313

14-
const _CreateButton: React.FC<CreateButtonProps> = ({ onClick, isDisabled, isLoading, isCompact, label, ...props }) => {
14+
const _CreateButton: React.FC<CreateButtonProps> = ({
15+
onClick,
16+
isDisabled,
17+
isLoading,
18+
isCompact = true,
19+
label,
20+
...props
21+
}) => {
1522
const { t } = useTranslation();
1623
const breakpoint = useBreakpoint();
1724

‎src/components/Buttons/DeleteButton/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const _DeleteButton: React.FC<DeleteButtonProps> = ({
1616
onClick,
1717
isDisabled,
1818
isLoading,
19-
isCompact,
19+
isCompact = true,
2020
label,
2121
ml,
2222
...props

‎src/components/Buttons/DeviceActionDropdown/index.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ const DeviceActionDropdown = ({
5151
onOpenScriptModal,
5252
onOpenRebootModal,
5353
size,
54-
isCompact,
54+
isCompact = true,
5555
}: Props) => {
5656
const { t } = useTranslation();
5757
const toast = useToast();
@@ -163,7 +163,7 @@ const DeviceActionDropdown = ({
163163

164164
return (
165165
<Menu>
166-
<Tooltip label={t('commands.other')}>
166+
<Tooltip label={t('common.actions')}>
167167
{size === undefined || isCompact ? (
168168
<MenuButton
169169
as={IconButton}
@@ -182,7 +182,7 @@ const DeviceActionDropdown = ({
182182
isDisabled={isDisabled}
183183
ml={2}
184184
>
185-
{t('commands.other')}
185+
{t('common.actions')}
186186
</MenuButton>
187187
)}
188188
</Tooltip>

‎src/components/Buttons/EditButton/index.tsx

+12-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react';
22
import { IconButton, Button, Tooltip, useBreakpoint } from '@chakra-ui/react';
33
import { Pen } from 'phosphor-react';
4+
import { useTranslation } from 'react-i18next';
45

56
export interface EditButtonProps {
67
onClick: () => void;
@@ -11,7 +12,15 @@ export interface EditButtonProps {
1112
ml?: string | number;
1213
}
1314

14-
const _EditButton: React.FC<EditButtonProps> = ({ onClick, label, isDisabled, isLoading, isCompact, ...props }) => {
15+
const _EditButton: React.FC<EditButtonProps> = ({
16+
onClick,
17+
label,
18+
isDisabled,
19+
isLoading,
20+
isCompact = true,
21+
...props
22+
}) => {
23+
const { t } = useTranslation();
1524
const breakpoint = useBreakpoint();
1625

1726
if (!isCompact && breakpoint !== 'base' && breakpoint !== 'sm') {
@@ -24,12 +33,12 @@ const _EditButton: React.FC<EditButtonProps> = ({ onClick, label, isDisabled, is
2433
isDisabled={isDisabled}
2534
{...props}
2635
>
27-
{label}
36+
{label ?? t('common.edit')}
2837
</Button>
2938
);
3039
}
3140
return (
32-
<Tooltip label={label}>
41+
<Tooltip label={label ?? t('common.edit')} hasArrow>
3342
<IconButton
3443
aria-label="edit"
3544
colorScheme="gray"

‎src/components/Buttons/RefreshButton/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const _RefreshButton: React.FC<RefreshButtonProps> = ({
1717
onClick,
1818
isDisabled,
1919
isFetching,
20-
isCompact,
20+
isCompact = true,
2121
ml,
2222
size,
2323
...props

‎src/components/Buttons/ResponsiveButton/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const _ResponsiveButton: React.FC<ResponsiveButtonProps> = ({
1515
onClick,
1616
isDisabled,
1717
isLoading,
18-
isCompact,
18+
isCompact = true,
1919
color,
2020
label,
2121
icon,

‎src/components/Buttons/SaveButton/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const _SaveButton: React.FC<SaveButtonProps> = ({
1818
onClick,
1919
isDisabled,
2020
isLoading,
21-
isCompact,
21+
isCompact = true,
2222
isDirty,
2323
dirtyCheck,
2424
...props

‎src/components/Buttons/ToggleEditButton/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const _ToggleEditButton: React.FC<ToggleEditButtonProps> = ({
2020
isDirty,
2121
isDisabled,
2222
isLoading,
23-
isCompact,
23+
isCompact = true,
2424
ml,
2525
...props
2626
}) => {

‎src/components/Buttons/WarningButton/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const _WarningButton: React.FC<WarningButtonProps> = ({
1616
onClick,
1717
isDisabled,
1818
isLoading,
19-
isCompact,
19+
isCompact = true,
2020
label,
2121
...props
2222
}) => {

‎src/components/DataTables/ColumnPicker/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export const ColumnPicker = ({
2121
hiddenColumns,
2222
setHiddenColumns,
2323
size,
24-
isCompact,
24+
isCompact = true,
2525
}: ColumnPickerProps) => {
2626
const { t } = useTranslation();
2727
const { getPref, setPref } = useAuth();

‎src/components/DataTables/DataTable/index.tsx

+35-10
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,14 @@ const defaultProps = {
4444
sortBy: [],
4545
};
4646

47-
export type DataTableProps = {
48-
columns: readonly Column<object>[];
49-
data: object[];
47+
export type DataTableProps<TValue> = {
48+
columns: Column<TValue>[];
49+
data: TValue[];
5050
count?: number;
5151
setPageInfo?: React.Dispatch<React.SetStateAction<PageInfo | undefined>>;
5252
isLoading?: boolean;
53+
onRowClick?: (row: TValue) => void;
54+
isRowClickable?: (row: TValue) => boolean;
5355
obj?: string;
5456
sortBy?: { id: string; desc: boolean }[];
5557
hiddenColumns?: string[];
@@ -68,7 +70,7 @@ type TableInstanceWithHooks<T extends object> = TableInstance<T> &
6870
state: UsePaginationState<T>;
6971
};
7072

71-
const _DataTable = ({
73+
const _DataTable = <TValue extends object>({
7274
columns,
7375
data,
7476
isLoading,
@@ -84,7 +86,9 @@ const _DataTable = ({
8486
isManual,
8587
saveSettingsId,
8688
showAllRows,
87-
}: DataTableProps) => {
89+
onRowClick,
90+
isRowClickable,
91+
}: DataTableProps<TValue>) => {
8892
const { t } = useTranslation();
8993
const breakpoint = useBreakpoint();
9094
const textColor = useColorModeValue('gray.700', 'white');
@@ -143,7 +147,7 @@ const _DataTable = ({
143147
},
144148
useSortBy,
145149
usePagination,
146-
) as TableInstanceWithHooks<object>;
150+
) as TableInstanceWithHooks<TValue>;
147151

148152
const handleGoToPage = (newPage: number) => {
149153
if (saveSettingsId) localStorage.setItem(`${saveSettingsId}.page`, String(newPage));
@@ -260,15 +264,18 @@ const _DataTable = ({
260264
</Thead>
261265
{data.length > 0 && (
262266
<Tbody {...getTableBodyProps()}>
263-
{page.map((row: Row) => {
267+
{page.map((row: Row<TValue>) => {
264268
prepareRow(row);
269+
const rowIsClickable = isRowClickable ? isRowClickable(row.original) : true;
270+
const onClick = rowIsClickable && onRowClick ? () => onRowClick(row.original) : undefined;
265271
return (
266272
<Tr
267273
{...row.getRowProps()}
268274
key={uuid()}
269275
_hover={{
270276
backgroundColor: hoveredRowBg,
271277
}}
278+
onClick={onClick}
272279
>
273280
{
274281
// @ts-ignore
@@ -288,8 +295,26 @@ const _DataTable = ({
288295
fontSize="14px"
289296
// @ts-ignore
290297
textAlign={cell.column.isCentered ? 'center' : undefined}
291-
// @ts-ignore
292-
fontFamily={cell.column.isMonospace ? 'monospace' : undefined}
298+
fontFamily={
299+
// @ts-ignore
300+
cell.column.isMonospace
301+
? 'Inter, SFMono-Regular, Menlo, Monaco, Consolas, monospace'
302+
: undefined
303+
}
304+
onClick={
305+
// @ts-ignore
306+
cell.column.stopPropagation || (cell.column.id === 'actions' && onRowClick)
307+
? (e) => {
308+
e.stopPropagation();
309+
}
310+
: undefined
311+
}
312+
cursor={
313+
// @ts-ignore
314+
!cell.column.stopPropagation && cell.column.id !== 'actions' && onRowClick
315+
? 'pointer'
316+
: undefined
317+
}
293318
>
294319
{cell.render('Cell')}
295320
</Td>
@@ -414,4 +439,4 @@ const _DataTable = ({
414439

415440
_DataTable.defaultProps = defaultProps;
416441

417-
export const DataTable = React.memo(_DataTable);
442+
export const DataTable = React.memo(_DataTable) as unknown as typeof _DataTable;

‎src/components/DataTables/SortableDataTable/index.tsx

+6-2
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,12 @@ const SortableDataTable: React.FC<Props> = ({
249249
fontSize="14px"
250250
// @ts-ignore
251251
textAlign={cell.column.isCentered ? 'center' : undefined}
252-
// @ts-ignore
253-
fontFamily={cell.column.isMonospace ? 'monospace' : undefined}
252+
fontFamily={
253+
// @ts-ignore
254+
cell.column.isMonospace
255+
? 'Inter, SFMono-Regular, Menlo, Monaco, Consolas, monospace'
256+
: undefined
257+
}
254258
>
255259
{cell.render('Cell')}
256260
</Td>

0 commit comments

Comments
 (0)