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.

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

Move the refresh icon to the 'Change view' toolbar, left aligned #1161

Merged
merged 5 commits into from
Dec 23, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Merge branch 'develop' into refresh-button-rows
dzonidoo committed Dec 23, 2024
commit 2af89fd0cd7a26f61fb31826baba8c611519c032
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -40,7 +40,8 @@
"firebase": "10.12.2",
"lodash": "^4.17.19",
"moment": "2.30.1",
"moment-timezone": "0.5.41",
"moment-timezone": "0.5.46",
"sass": "~1.3.0",
"popper.js": "1.14.4",
"primeicons": "^7.0.0",
"primereact": "^10.8.4",

Unchanged files with check annotations Beta

const compareFunction = (a: any, b: any) => String(a.key).localeCompare(String(b.key));
const processBuckets = (buckets: any, filter: any, toggleFilter: any, dropdownMenuHeader: any) => buckets.sort(compareFunction).map((bucket: any) =>

Check warning on line 7 in assets/agenda/components/AgendaDropdownFilter.tsx

GitHub Actions / client (14)

'dropdownMenuHeader' is defined but never used

Check warning on line 7 in assets/agenda/components/AgendaDropdownFilter.tsx

GitHub Actions / client (18)

'dropdownMenuHeader' is defined but never used

Check warning on line 7 in assets/agenda/components/AgendaDropdownFilter.tsx

GitHub Actions / client (20)

'dropdownMenuHeader' is defined but never used
<button
key={bucket.key}
className='dropdown-item'
import classNames from 'classnames';
import {isEqual} from 'lodash';
import {IAgendaItem, IPlanningItem, ICoverage, IUser} from 'interfaces';

Check warning on line 5 in assets/agenda/components/AgendaListCoverageItem.tsx

GitHub Actions / client (14)

'IAgendaItem' is defined but never used

Check warning on line 5 in assets/agenda/components/AgendaListCoverageItem.tsx

GitHub Actions / client (18)

'IAgendaItem' is defined but never used

Check warning on line 5 in assets/agenda/components/AgendaListCoverageItem.tsx

GitHub Actions / client (20)

'IAgendaItem' is defined but never used
import {gettext} from '../../utils';
import {
getCoverageIcon,
import {formatDate, gettext} from 'utils';
import {getCoverageIcon} from '../utils';
import {Skeleton} from 'primereact/skeleton';

Check warning on line 8 in assets/agenda/components/AgendaListGroupHeader.tsx

GitHub Actions / client (14)

'Skeleton' is defined but never used

Check warning on line 8 in assets/agenda/components/AgendaListGroupHeader.tsx

GitHub Actions / client (18)

'Skeleton' is defined but never used

Check warning on line 8 in assets/agenda/components/AgendaListGroupHeader.tsx

GitHub Actions / client (20)

'Skeleton' is defined but never used
interface IProps {
group: string;
}
if (coverageAdded) {
itemCount += 1;

Check warning on line 49 in assets/agenda/components/AgendaListGroupHeader.tsx

GitHub Actions / client (14)

'itemCount' is assigned a value but never used

Check warning on line 49 in assets/agenda/components/AgendaListGroupHeader.tsx

GitHub Actions / client (18)

'itemCount' is assigned a value but never used

Check warning on line 49 in assets/agenda/components/AgendaListGroupHeader.tsx

GitHub Actions / client (20)

'itemCount' is assigned a value but never used
}
}
const span = paragraph.getElementsByClassName('es-highlight');
if (span.length > 0) {
[...arrayOfParagraphs].slice(i, arrayOfParagraphs.length).forEach((paragraph, i) => {

Check warning on line 208 in assets/agenda/components/AgendaListItem.tsx

GitHub Actions / client (14)

'i' is defined but never used

Check warning on line 208 in assets/agenda/components/AgendaListItem.tsx

GitHub Actions / client (18)

'i' is defined but never used

Check warning on line 208 in assets/agenda/components/AgendaListItem.tsx

GitHub Actions / client (20)

'i' is defined but never used
if (segmentsRemainingToBeAdded > 0) {
paragraphsInnerText += paragraph.innerText;
paragraph.innerHTML = paragraph.innerHTML.split('<br>').filter((p: string) => p.trim() !== '').slice(0, segmentsRemainingToBeAdded).join('<br>');
}
}
componentWillReceiveProps(nextProps: any) {

Check warning on line 57 in assets/agenda/components/CoverageItemStatus.tsx

GitHub Actions / client (14)

componentWillReceiveProps is deprecated since React 16.9.0, use UNSAFE_componentWillReceiveProps instead, see https://reactjs.org/docs/react-component.html#unsafe_componentwillreceiveprops. Use https://github.com/reactjs/react-codemod#rename-unsafe-lifecycles to automatically update your components

Check warning on line 57 in assets/agenda/components/CoverageItemStatus.tsx

GitHub Actions / client (18)

componentWillReceiveProps is deprecated since React 16.9.0, use UNSAFE_componentWillReceiveProps instead, see https://reactjs.org/docs/react-component.html#unsafe_componentwillreceiveprops. Use https://github.com/reactjs/react-codemod#rename-unsafe-lifecycles to automatically update your components

Check warning on line 57 in assets/agenda/components/CoverageItemStatus.tsx

GitHub Actions / client (20)

componentWillReceiveProps is deprecated since React 16.9.0, use UNSAFE_componentWillReceiveProps instead, see https://reactjs.org/docs/react-component.html#unsafe_componentwillreceiveprops. Use https://github.com/reactjs/react-codemod#rename-unsafe-lifecycles to automatically update your components
this.setWireItem(nextProps);
}
size?: 'normal' | 'big';
}
export default function TopStoryLabel({item, config, size}: IProps) {

Check warning on line 12 in assets/agenda/components/TopStoryLabel.tsx

GitHub Actions / client (14)

'config' is defined but never used

Check warning on line 12 in assets/agenda/components/TopStoryLabel.tsx

GitHub Actions / client (18)

'config' is defined but never used

Check warning on line 12 in assets/agenda/components/TopStoryLabel.tsx

GitHub Actions / client (20)

'config' is defined but never used
const classes = classNames('label label--fill label--rounded label--top-story', {
'label--big': size === 'big',
'mb-2': size === 'big',
}
// compare days without being affected by timezone
const isBetweenDay = (day: moment.Moment, start: moment.Moment, end: moment.Moment, allDay=false, noEndTime=false) => {

Check warning on line 686 in assets/agenda/utils.ts

GitHub Actions / client (14)

'noEndTime' is assigned a value but never used

Check warning on line 686 in assets/agenda/utils.ts

GitHub Actions / client (18)

'noEndTime' is assigned a value but never used

Check warning on line 686 in assets/agenda/utils.ts

GitHub Actions / client (20)

'noEndTime' is assigned a value but never used
let testDay = day;
let startDate = start;
let endDate = end;
import React, {Fragment} from 'react';

Check warning on line 1 in assets/companies/components/EditCompanyAPI.tsx

GitHub Actions / client (14)

'Fragment' is defined but never used

Check warning on line 1 in assets/companies/components/EditCompanyAPI.tsx

GitHub Actions / client (18)

'Fragment' is defined but never used

Check warning on line 1 in assets/companies/components/EditCompanyAPI.tsx

GitHub Actions / client (20)

'Fragment' is defined but never used
import PropTypes from 'prop-types';
import {get, isEqual} from 'lodash';
import {gettext} from '../../utils';
this.state = {noListInput: true};
}
componentWillReceiveProps(nextProps: any) {

Check warning on line 23 in assets/companies/components/EditCompanyAPI.tsx

GitHub Actions / client (14)

componentWillReceiveProps is deprecated since React 16.9.0, use UNSAFE_componentWillReceiveProps instead, see https://reactjs.org/docs/react-component.html#unsafe_componentwillreceiveprops. Use https://github.com/reactjs/react-codemod#rename-unsafe-lifecycles to automatically update your components

Check warning on line 23 in assets/companies/components/EditCompanyAPI.tsx

GitHub Actions / client (18)

componentWillReceiveProps is deprecated since React 16.9.0, use UNSAFE_componentWillReceiveProps instead, see https://reactjs.org/docs/react-component.html#unsafe_componentwillreceiveprops. Use https://github.com/reactjs/react-codemod#rename-unsafe-lifecycles to automatically update your components

Check warning on line 23 in assets/companies/components/EditCompanyAPI.tsx

GitHub Actions / client (20)

componentWillReceiveProps is deprecated since React 16.9.0, use UNSAFE_componentWillReceiveProps instead, see https://reactjs.org/docs/react-component.html#unsafe_componentwillreceiveprops. Use https://github.com/reactjs/react-codemod#rename-unsafe-lifecycles to automatically update your components
if (!isEqual(get(this.props, 'company.allowed_ip_list'), get(nextProps, 'company.allowed_ip_list'))) {
this.setState({noListInput: true});
}
You are viewing a condensed version of this merge commit. You can view the full changes here.