Skip to content

Regression: Lint warnings and some datepicker #20280

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
ggazzo merged 1 commit into from
Jan 20, 2021
Merged

Regression: Lint warnings and some datepicker #20280

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
2 changes: 1 addition & 1 deletion app/theme/client/imports/general/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,4 +249,4 @@ button {

.gallery-item {
cursor: pointer;
}
}
4 changes: 2 additions & 2 deletions app/threads/client/flextab/threadlist.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useMemo, lazy, LazyExoticComponent, FC } from 'react';
import React, { useMemo, lazy, LazyExoticComponent, FC, ReactNode } from 'react';
import { BadgeProps } from '@rocket.chat/fuselage';

import { addAction } from '../../../../client/views/room/lib/Toolbox';
Expand Down Expand Up @@ -28,7 +28,7 @@ addAction('thread', (options) => {
title: 'Threads',
icon: 'thread',
template,
renderAction: (props) => {
renderAction: (props): ReactNode => {
const unread = room.tunread?.length > 99 ? '99+' : room.tunread?.length;
const variant = getVariant(room.tunreadUser?.length, room.tunreadGroup?.length);
return <Header.ToolBoxAction {...props} >
Expand Down
1 change: 1 addition & 0 deletions app/ui-utils/client/lib/RoomHistoryManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ export const RoomHistoryManager = new class {

return setTimeout(() => msgElement.removeClass('highlight'), 500);
}

const room = this.getRoom(message.rid);
room.isLoading.set(true);
let typeName = undefined;
Expand Down
2 changes: 1 addition & 1 deletion client/components/Message/Attachments/providers/AttachmentProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const AttachmentProvider: FC<{}> = ({ children }) => {
width: 480,
height: 360,
},
}), [autoLoadEmbedMedias, collapsedByDefault, saveMobileBandwidth, reducedData]);
}), [collapsedByDefault, reducedData, autoLoadEmbedMedias, saveMobileBandwidth, isMobile]);

return <AttachmentContext.Provider children={children} value={contextValue} />;
};
Expand Down
8 changes: 4 additions & 4 deletions client/views/omnichannel/analytics/AnalyticsPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@ const AnalyticsPage = () => {
<Page.Header title={t('Analytics')}/>
<Page.ScrollableContentWithShadow display='flex' flexDirection='column'>
<Margins block='x4'>
<Box display='flex' flexDirection='row' flexWrap='wrap' >
<Box display='flex' mie='x8' flexGrow={1} flexDirection='column'>
<Box display='flex' mi='neg-x4' flexDirection='row' flexWrap='wrap' >
<Box display='flex' mi='x4' flexGrow={1} flexDirection='column'>
<Label mb='x4' >{t('Type')}</Label>
<Select flexShrink={0} options={typeOptions} value={type} onChange={setType} />
</Box>
<Box display='flex' mie='x8' flexGrow={1} flexDirection='column'>
<Box display='flex' mi='x4' flexGrow={1} flexDirection='column'>
<Label mb='x4'>{t('Departments')}</Label>
<DepartmentAutoComplete flexShrink={0} placeholder={t('All')} value={departmentId} onChange={setDepartmentId}/>
</Box>
<DateRangePicker onChange={setDateRange}/>
<DateRangePicker mi='x4' flexGrow={1} onChange={setDateRange}/>
</Box>
<Box>
<Overview type={type} dateRange={dateRange} departmentId={departmentId}/>
Expand Down
34 changes: 20 additions & 14 deletions client/views/omnichannel/analytics/DateRangePicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,20 +91,26 @@ const DateRangePicker = ({ onChange = () => {}, ...props }) => {
},
}), [handleRange, t]);

return <Box display='flex' mie='x8' flexGrow={1} flexDirection='row' {...props}>
<Field mie='x4' flexShrink={1} flexGrow={1}>
<Field.Label>{t('Start')}</Field.Label>
<Field.Row>
<InputBox type='date' onChange={handleStart} max={todayDate} value={start}/>
</Field.Row>
</Field>
<Field mie='x4' flexShrink={1} flexGrow={1}>
<Field.Label>{t('End')}</Field.Label>
<Field.Row>
<InputBox type='date' onChange={handleEnd} min={start} max={todayDate} value={end}/>
<Menu options={options}/>
</Field.Row>
</Field>
return <Box {...props}>
<Box mi='neg-x4' height='full' display='flex' flexDirection='row'>
<Field mi='x4' flexShrink={1} flexGrow={1}>
<Field.Label>{t('Start')}</Field.Label>
<Field.Row>
<Box height='x40' display='flex' width='full'>
<InputBox type='date' onChange={handleStart} max={todayDate} value={start}/>
</Box>
</Field.Row>
</Field>
<Field mi='x4' flexShrink={1} flexGrow={1}>
<Field.Label>{t('End')}</Field.Label>
<Field.Row>
<Box height='x40' display='flex' width='full'>
<InputBox type='date' onChange={handleEnd} min={start} max={todayDate} value={end}/>
</Box>
<Menu mis='x8' options={options}/>
</Field.Row>
</Field>
</Box>
</Box>;
};

Expand Down