diff --git a/e2e/tests/submissions/conference.test.js b/e2e/tests/submissions/conference.test.js index 76aea453c0..821804d1d4 100644 --- a/e2e/tests/submissions/conference.test.js +++ b/e2e/tests/submissions/conference.test.js @@ -1,7 +1,7 @@ const moment = require('moment'); const { ResponseInterceptor } = require('../../utils/interceptors'); const { login } = require('../../utils/user'); -const { FormSubmitter } = require('../../utils/form'); +const { FormSubmitter, DATE_FORMAT } = require('../../utils/form'); const routes = require('../../utils/routes'); describe('conference submissions', () => { @@ -49,7 +49,6 @@ describe('conference submissions', () => { additional_info: 'This is some additional info', keywords: ['keyword1', 'keyword2'], }); - await formSubmitter.waitForSubmissionSuccess(); const submitResponse = interceptor.getFirstResponseByUrl( @@ -70,8 +69,8 @@ describe('conference submissions', () => { country_code: 'CH', }, ], - opening_date: startDateMoment.format('YYYY-MM-DD'), - closing_date: endDateMoment.format('YYYY-MM-DD'), + opening_date: startDateMoment.format(DATE_FORMAT), + closing_date: endDateMoment.format(DATE_FORMAT), inspire_categories: [{ term: 'Accelerators' }], keywords: [{ value: 'keyword1' }, { value: 'keyword2' }], public_notes: [{ value: 'This is some additional info' }], @@ -107,11 +106,11 @@ describe('conference submissions', () => { await formSubmitter.fill({ name: 'Please come to my conference', - dates: [moment().add(20, 'day'), moment().add(24, 'day')], + dates: [moment().add(10, 'day'), moment().add(11, 'day')], addresses: [ { city: 'Stockholm', - country: 'Sweden', + country: 'Switzerland', }, ], field_of_interest: ['Computing'], diff --git a/e2e/tests/submissions/job.test.js b/e2e/tests/submissions/job.test.js index d1a34752cd..1775dda3c9 100644 --- a/e2e/tests/submissions/job.test.js +++ b/e2e/tests/submissions/job.test.js @@ -1,7 +1,7 @@ const moment = require('moment'); const { ResponseInterceptor } = require('../../utils/interceptors'); const { login } = require('../../utils/user'); -const { FormSubmitter } = require('../../utils/form'); +const { FormSubmitter, DATE_FORMAT } = require('../../utils/form'); const routes = require('../../utils/routes'); describe('job submissions', () => { @@ -70,7 +70,7 @@ describe('job submissions', () => { urls: [{ value: 'https://someinfo.com' }], deadline_date: moment() .add(1, 'day') - .format('YYYY-MM-DD'), + .format(DATE_FORMAT), contact_details: [ { name: 'John Doe', diff --git a/e2e/utils/dom.js b/e2e/utils/dom.js index 9b21d92a81..93d42c4c41 100644 --- a/e2e/utils/dom.js +++ b/e2e/utils/dom.js @@ -4,9 +4,10 @@ const TYPE_ATTRIBUTE = 'data-test-type'; async function selectFromSelectBox(page, selectId, value) { const selectSelector = `[${ID_ATTRIBUTE}="${selectId}"]`; const selectOptionSelector = `[${ID_ATTRIBUTE}="${selectId}-option-${value}"]`; + const optionSearchSelector = `${selectSelector} input`; - // click selecbox to render options into DOM incase not there - await page.click(selectSelector); + // type optio to selecbox to make sure it is rendered into DOM + await page.type(optionSearchSelector, value); await page.waitFor(selectOptionSelector); // close it because puppeteer sometimes clicks on other option accidentally diff --git a/e2e/utils/form.js b/e2e/utils/form.js index 0570a9b369..efe725cfec 100644 --- a/e2e/utils/form.js +++ b/e2e/utils/form.js @@ -1,13 +1,21 @@ /* eslint-disable no-await-in-loop, no-restricted-syntax */ const moment = require('moment'); + const routes = require('./routes'); const { selectFromSelectBox, ID_ATTRIBUTE, TYPE_ATTRIBUTE } = require('./dom'); +const SUBMIT_BUTTON_SELECTOR = 'button[type=submit]'; +const DATE_FORMAT = 'YYYY-MM-DD'; + function joinPaths(...paths) { return paths.filter(path => path != null).join('.'); } -const SUBMIT_BUTTON_SELECTOR = 'button[type=submit]'; +async function fillDateInputElement(element, dateValue) { + const dateMoment = moment(dateValue); + const formattedDate = dateMoment.format(DATE_FORMAT); + await element.type(formattedDate); +} class FormSubmitter { constructor(page) { @@ -43,6 +51,7 @@ class FormSubmitter { } async fill(data) { + await this.page.waitFor('form'); await this.fillAnyField(null, data); await this.page.click('form'); } @@ -63,6 +72,9 @@ class FormSubmitter { case 'string': await this.fillNumberOrStringField(path, data); break; + case 'suggester': + await this.fillSuggesterField(path, data); + break; case 'single-select': await this.fillSingleSelectField(path, data); break; @@ -142,6 +154,12 @@ class FormSubmitter { } } + async fillSuggesterField(path, value) { + const fieldSelector = `[${ID_ATTRIBUTE}="${path}"]`; + const innerInputSelector = `${fieldSelector} input`; + await this.page.type(innerInputSelector, value); + } + async fillNumberOrStringField(path, value) { const fieldSelector = `[${ID_ATTRIBUTE}="${path}"]`; await this.page.type(fieldSelector, value); @@ -157,23 +175,22 @@ class FormSubmitter { } } - async selectDateOnActivePicker(date) { - const dateSelector = `[title="${moment(date).format('MMMM D, YYYY')}"]`; - await this.page.waitFor(dateSelector); - await this.page.click(dateSelector); - } - async fillDateField(path, value) { const fieldSelector = `[${ID_ATTRIBUTE}="${path}"]`; - await this.page.click(fieldSelector); - await this.selectDateOnActivePicker(value); + const fieldElement = await this.page.$(fieldSelector); + await fillDateInputElement(fieldElement, value); } async fillDateRangeField(path, [startDate, endDate]) { const fieldSelector = `[${ID_ATTRIBUTE}="${path}"]`; - await this.page.click(fieldSelector); - await this.selectDateOnActivePicker(startDate); - await this.selectDateOnActivePicker(endDate); + const inputsSelector = `${fieldSelector} input`; + + const [startDateInputElement, endDateInputElement] = await this.page.$$(inputsSelector); + + await fillDateInputElement(startDateInputElement, startDate); + await fillDateInputElement(endDateInputElement, endDate); + + await endDateInputElement.press('Enter'); } async fillRichTextField(path, value) { @@ -185,4 +202,5 @@ class FormSubmitter { module.exports = { FormSubmitter, SUBMIT_BUTTON_SELECTOR, + DATE_FORMAT, }; diff --git a/ui/package.json b/ui/package.json index 4ab6cc4a54..4fdff19f95 100644 --- a/ui/package.json +++ b/ui/package.json @@ -2,7 +2,7 @@ "name": "inspire-next-react", "license": "GPL-2.0", "version": "0.1.19", - "proxy": "localhost:8000", + "proxy": "http://localhost:8000", "bundlesize": [ { "path": "./build/**/*.js", @@ -23,10 +23,11 @@ "./node_modules/eslint/bin/eslint.js ./src --ext .js,.jsx --config .eslintrc" }, "dependencies": { + "@ant-design/icons": "^4.0.0", "@babel/runtime": "7.0.0-beta.55", "@craco/craco": "^3.1.0", "@sentry/browser": "^4.3.0", - "antd": "^3.4.1", + "antd": "^4.0.0", "axios": "^0.18.0", "classnames": "^2.2.6", "connected-react-router": "^6.4.0", @@ -58,7 +59,7 @@ "react-piwik": "^1.6.0", "react-quill": "^1.3.3", "react-redux": "^6.0.0", - "react-router-dom": "^4.2.2", + "react-router-dom": "^5.1.0", "react-sanitized-html": "^2.0.0", "react-scripts": "2.0.3", "react-vis": "^1.9.2", diff --git a/ui/src/App.scss b/ui/src/App.scss index 4937357bed..109578e444 100644 --- a/ui/src/App.scss +++ b/ui/src/App.scss @@ -46,10 +46,6 @@ } } - .mb4-important { - margin-bottom: 4px !important; - } - .secondary-color { color: $secondary-color; } @@ -119,6 +115,10 @@ } } +.mb2-important { + margin-bottom: 0.5rem !important; +} + .ant-drawer-body { @media (max-width: $screen-xs-max) { padding: $drawer-body-padding / 2 !important; diff --git a/ui/src/authors/components/AuthorEmailsAction.jsx b/ui/src/authors/components/AuthorEmailsAction.jsx index 8c0f96d10e..8ddcb0166a 100644 --- a/ui/src/authors/components/AuthorEmailsAction.jsx +++ b/ui/src/authors/components/AuthorEmailsAction.jsx @@ -1,7 +1,8 @@ import React from 'react'; import PropTypes from 'prop-types'; import { List } from 'immutable'; -import { Menu, Icon, Tooltip } from 'antd'; +import { MailOutlined } from '@ant-design/icons'; +import { Menu, Tooltip } from 'antd'; import ExternalLink from '../../common/components/ExternalLink'; import ActionsDropdownOrAction from '../../common/components/ActionsDropdownOrAction'; @@ -26,7 +27,7 @@ function renderEmailAction(email, title) { const ACTION_TITLE = ( - + ); diff --git a/ui/src/authors/components/AuthorLinkedinAction.jsx b/ui/src/authors/components/AuthorLinkedinAction.jsx index 5b7260eb62..16e7bc6203 100644 --- a/ui/src/authors/components/AuthorLinkedinAction.jsx +++ b/ui/src/authors/components/AuthorLinkedinAction.jsx @@ -1,6 +1,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { Icon, Tooltip } from 'antd'; +import { LinkedinOutlined } from '@ant-design/icons'; +import { Tooltip } from 'antd'; import ListItemAction from '../../common/components/ListItemAction'; import ExternalLink from '../../common/components/ExternalLink'; @@ -13,7 +14,7 @@ class AuthorLinkedinAction extends Component { - + diff --git a/ui/src/authors/components/AuthorOrcid/AuthorOrcid.jsx b/ui/src/authors/components/AuthorOrcid/AuthorOrcid.jsx index 38f82da653..9bc6de1650 100644 --- a/ui/src/authors/components/AuthorOrcid/AuthorOrcid.jsx +++ b/ui/src/authors/components/AuthorOrcid/AuthorOrcid.jsx @@ -10,11 +10,11 @@ class AuthorOrcid extends Component { render() { const { orcid } = this.props; return ( - - + + ORCID - - + + ); } } diff --git a/ui/src/authors/components/AuthorOrcid/__tests__/__snapshots__/AuthorOrcid.test.jsx.snap b/ui/src/authors/components/AuthorOrcid/__tests__/__snapshots__/AuthorOrcid.test.jsx.snap index 76e4e1ccfc..95f63a9ac0 100644 --- a/ui/src/authors/components/AuthorOrcid/__tests__/__snapshots__/AuthorOrcid.test.jsx.snap +++ b/ui/src/authors/components/AuthorOrcid/__tests__/__snapshots__/AuthorOrcid.test.jsx.snap @@ -1,23 +1,23 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`AuthorOrcid renders with orcid 1`] = ` - - ORCID - - + + `; diff --git a/ui/src/authors/components/AuthorTwitterAction.jsx b/ui/src/authors/components/AuthorTwitterAction.jsx index c7f7163109..a5a833f5b8 100644 --- a/ui/src/authors/components/AuthorTwitterAction.jsx +++ b/ui/src/authors/components/AuthorTwitterAction.jsx @@ -1,6 +1,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { Icon, Tooltip } from 'antd'; +import { TwitterOutlined } from '@ant-design/icons'; +import { Tooltip } from 'antd'; import ListItemAction from '../../common/components/ListItemAction'; import ExternalLink from '../../common/components/ExternalLink'; @@ -13,7 +14,7 @@ class AuthorTwitterAction extends Component { - + diff --git a/ui/src/authors/components/AuthorWebsitesAction.jsx b/ui/src/authors/components/AuthorWebsitesAction.jsx index f6044d9127..8e63ce3f90 100644 --- a/ui/src/authors/components/AuthorWebsitesAction.jsx +++ b/ui/src/authors/components/AuthorWebsitesAction.jsx @@ -1,7 +1,8 @@ import React, { useMemo } from 'react'; import PropTypes from 'prop-types'; import { List } from 'immutable'; -import { Menu, Icon, Tooltip } from 'antd'; +import { LinkOutlined } from '@ant-design/icons'; +import { Menu, Tooltip } from 'antd'; import ExternalLink from '../../common/components/ExternalLink'; import { removeProtocolAndWwwFromUrl } from '../../common/utils'; @@ -48,7 +49,7 @@ function renderWebsiteAction(website, title) { const ACTION_TITLE = ( - + ); diff --git a/ui/src/authors/components/UserSettingsAction.jsx b/ui/src/authors/components/UserSettingsAction.jsx index 04827f4335..399a624fe0 100644 --- a/ui/src/authors/components/UserSettingsAction.jsx +++ b/ui/src/authors/components/UserSettingsAction.jsx @@ -1,5 +1,6 @@ import React, { useCallback, useState } from 'react'; import { Button } from 'antd'; +import { SettingOutlined } from '@ant-design/icons'; import ListItemAction from '../../common/components/ListItemAction'; import IconText from '../../common/components/IconText'; @@ -18,7 +19,7 @@ function UserSettingsAction() { <> F.Marchetto.1 diff --git a/ui/src/authors/components/__tests__/__snapshots__/AuthorEmailsAction.test.jsx.snap b/ui/src/authors/components/__tests__/__snapshots__/AuthorEmailsAction.test.jsx.snap index 41f403449f..e42fdc30fe 100644 --- a/ui/src/authors/components/__tests__/__snapshots__/AuthorEmailsAction.test.jsx.snap +++ b/ui/src/authors/components/__tests__/__snapshots__/AuthorEmailsAction.test.jsx.snap @@ -20,9 +20,7 @@ exports[`AuthorEmailsAction renders multiple current emails in a dropdown 1`] = title="Contact author" transitionName="zoom-big-fast" > - + } @@ -63,9 +61,7 @@ exports[`AuthorEmailsAction renders single email 1`] = ` title="Contact author" transitionName="zoom-big-fast" > - + diff --git a/ui/src/authors/components/__tests__/__snapshots__/AuthorLinkedinAction.test.jsx.snap b/ui/src/authors/components/__tests__/__snapshots__/AuthorLinkedinAction.test.jsx.snap index 5d748b1dca..8a16fc3a5b 100644 --- a/ui/src/authors/components/__tests__/__snapshots__/AuthorLinkedinAction.test.jsx.snap +++ b/ui/src/authors/components/__tests__/__snapshots__/AuthorLinkedinAction.test.jsx.snap @@ -14,9 +14,7 @@ exports[`AuthorLinkedinAction renders with linkedin 1`] = ` - + diff --git a/ui/src/authors/components/__tests__/__snapshots__/AuthorResultItem.test.jsx.snap b/ui/src/authors/components/__tests__/__snapshots__/AuthorResultItem.test.jsx.snap index 7543c943c4..2fb593e912 100644 --- a/ui/src/authors/components/__tests__/__snapshots__/AuthorResultItem.test.jsx.snap +++ b/ui/src/authors/components/__tests__/__snapshots__/AuthorResultItem.test.jsx.snap @@ -11,7 +11,6 @@ exports[`AuthorResultItem renders full author result 1`] = ` > - + diff --git a/ui/src/authors/components/__tests__/__snapshots__/AuthorWebsitesAction.test.jsx.snap b/ui/src/authors/components/__tests__/__snapshots__/AuthorWebsitesAction.test.jsx.snap index f7f86408b2..ab8730bcba 100644 --- a/ui/src/authors/components/__tests__/__snapshots__/AuthorWebsitesAction.test.jsx.snap +++ b/ui/src/authors/components/__tests__/__snapshots__/AuthorWebsitesAction.test.jsx.snap @@ -14,9 +14,7 @@ exports[`AuthorWebsitesAction renders only a url 1`] = ` title="Personal website" transitionName="zoom-big-fast" > - + @@ -36,9 +34,7 @@ exports[`AuthorWebsitesAction renders only blog 1`] = ` title="Personal website" transitionName="zoom-big-fast" > - + @@ -64,9 +60,7 @@ exports[`AuthorWebsitesAction renders with a blog and urls in a dropdown 1`] = ` title="Personal website" transitionName="zoom-big-fast" > - + } diff --git a/ui/src/authors/components/__tests__/__snapshots__/OrcidPushSetting.test.jsx.snap b/ui/src/authors/components/__tests__/__snapshots__/OrcidPushSetting.test.jsx.snap index 2e7d702a03..a7b7f9335c 100644 --- a/ui/src/authors/components/__tests__/__snapshots__/OrcidPushSetting.test.jsx.snap +++ b/ui/src/authors/components/__tests__/__snapshots__/OrcidPushSetting.test.jsx.snap @@ -12,12 +12,7 @@ exports[`OrcidPushSetting renders when disabled 1`] = ` - } + icon={} okType="primary" onConfirm={[Function]} placement="top" @@ -66,12 +61,7 @@ exports[`OrcidPushSetting renders when enabled 1`] = ` - } + icon={} okType="primary" onConfirm={[Function]} placement="top" diff --git a/ui/src/authors/components/__tests__/__snapshots__/UserSettingsAction.test.jsx.snap b/ui/src/authors/components/__tests__/__snapshots__/UserSettingsAction.test.jsx.snap index 4fe20eb2b7..c26cd8e38f 100644 --- a/ui/src/authors/components/__tests__/__snapshots__/UserSettingsAction.test.jsx.snap +++ b/ui/src/authors/components/__tests__/__snapshots__/UserSettingsAction.test.jsx.snap @@ -11,8 +11,8 @@ exports[`UserSettingsAction renders 1`] = ` onClick={[Function]} > } text="settings" - type="setting" /> diff --git a/ui/src/authors/containers/SearchPageContainer.jsx b/ui/src/authors/containers/SearchPageContainer.jsx index 4ba384d933..9dcadd90ce 100644 --- a/ui/src/authors/containers/SearchPageContainer.jsx +++ b/ui/src/authors/containers/SearchPageContainer.jsx @@ -11,8 +11,8 @@ import LoadingOrChildren from '../../common/components/LoadingOrChildren'; import DocumentHead from '../../common/components/DocumentHead'; import { AUTHORS_NS } from '../../reducers/search'; -const META_DESCRIPTION = "Find authors in High Energy Physics" -const TITLE = "Authors Search" +const META_DESCRIPTION = 'Find authors in High Energy Physics'; +const TITLE = 'Authors Search'; class SearchPage extends Component { static renderAuthorItem(result) { @@ -27,7 +27,7 @@ class SearchPage extends Component { - + diff --git a/ui/src/common/components/AggregationBox.jsx b/ui/src/common/components/AggregationBox.jsx index e3050b93ac..f8776ca10e 100644 --- a/ui/src/common/components/AggregationBox.jsx +++ b/ui/src/common/components/AggregationBox.jsx @@ -9,12 +9,14 @@ class AggregationBox extends Component { return (
- +

{name}

{headerAction} - {children} + + {children} +
); } diff --git a/ui/src/common/components/AggregationFilters.jsx b/ui/src/common/components/AggregationFilters.jsx index 9a659839cb..fc45e692b0 100644 --- a/ui/src/common/components/AggregationFilters.jsx +++ b/ui/src/common/components/AggregationFilters.jsx @@ -53,7 +53,6 @@ class AggregationFilters extends Component { key={aggregationKey} xs={24} lg={inline ? 5 : 24} - gutter={32} > Name, Full diff --git a/ui/src/common/components/CheckboxAggregation.jsx b/ui/src/common/components/CheckboxAggregation.jsx index fadc6a3e43..0104695e7a 100644 --- a/ui/src/common/components/CheckboxAggregation.jsx +++ b/ui/src/common/components/CheckboxAggregation.jsx @@ -117,6 +117,9 @@ class CheckboxAggregation extends Component { const { selectionMap } = this.state; const { splitDisplayName, bucketHelp } = this.props; const bucketKey = bucket.get('key'); + const bucketDisplay = splitDisplayName + ? bucketKey.split(BUCKET_NAME_SPLITTER)[1] + : bucketKey; return ( @@ -127,9 +130,7 @@ class CheckboxAggregation extends Component { this.onSelectionChange(bucketKey, checked); }} > - {splitDisplayName - ? bucketKey.split(BUCKET_NAME_SPLITTER)[1] - : bucketKey} + {bucketDisplay} {bucketHelp && CheckboxAggregation.renderBucketHelpTooltip( bucketHelp.get(bucketKey) diff --git a/ui/src/common/components/CitationSummaryTable/__tests__/__snapshots__/CitationSummaryTable.test.jsx.snap b/ui/src/common/components/CitationSummaryTable/__tests__/__snapshots__/CitationSummaryTable.test.jsx.snap index dcca82578e..8c3430cdf2 100644 --- a/ui/src/common/components/CitationSummaryTable/__tests__/__snapshots__/CitationSummaryTable.test.jsx.snap +++ b/ui/src/common/components/CitationSummaryTable/__tests__/__snapshots__/CitationSummaryTable.test.jsx.snap @@ -65,12 +65,11 @@ exports[`CitationSummaryTable renders table without render props 1`] = ` help={ The h-index is defined as the number of papers with citation number higher or equal to h. - Learn more - + } label="h-index" diff --git a/ui/src/common/components/EditRecordAction.jsx b/ui/src/common/components/EditRecordAction.jsx index e157a395fe..f8978327d8 100644 --- a/ui/src/common/components/EditRecordAction.jsx +++ b/ui/src/common/components/EditRecordAction.jsx @@ -1,5 +1,6 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; +import { EditOutlined } from '@ant-design/icons'; import ListItemAction from './ListItemAction'; import IconText from './IconText'; @@ -30,7 +31,7 @@ class EditRecordAction extends Component { - + } /> diff --git a/ui/src/common/components/HelpIconTooltip.jsx b/ui/src/common/components/HelpIconTooltip.jsx index c0770fbfe1..a0d45bf265 100644 --- a/ui/src/common/components/HelpIconTooltip.jsx +++ b/ui/src/common/components/HelpIconTooltip.jsx @@ -1,5 +1,6 @@ import React, { Component } from 'react'; -import { Tooltip, Icon } from 'antd'; +import { QuestionCircleOutlined } from '@ant-design/icons'; +import { Tooltip } from 'antd'; import PropTypes from 'prop-types'; class HelpIconTooltip extends Component { @@ -7,7 +8,7 @@ class HelpIconTooltip extends Component { const { help } = this.props; return ( - + ); } diff --git a/ui/src/common/components/IconText/IconText.jsx b/ui/src/common/components/IconText/IconText.jsx index 94dd7a71d2..e5be9a9f0e 100644 --- a/ui/src/common/components/IconText/IconText.jsx +++ b/ui/src/common/components/IconText/IconText.jsx @@ -1,15 +1,14 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { Icon } from 'antd'; import './IconText.scss'; class IconText extends Component { render() { - const { type, text } = this.props; + const { icon, text } = this.props; return ( - + {icon} {text} ); @@ -17,7 +16,7 @@ class IconText extends Component { } IconText.propTypes = { - type: PropTypes.string.isRequired, + icon: PropTypes.node.isRequired, text: PropTypes.string.isRequired, }; diff --git a/ui/src/common/components/IconText/__tests__/IconText.test.jsx b/ui/src/common/components/IconText/__tests__/IconText.test.jsx index 9868cd4a80..886ba8bdd7 100644 --- a/ui/src/common/components/IconText/__tests__/IconText.test.jsx +++ b/ui/src/common/components/IconText/__tests__/IconText.test.jsx @@ -1,16 +1,12 @@ import React from 'react'; import { shallow } from 'enzyme'; +import { InfoOutlined } from '@ant-design/icons'; import IconText from '../IconText'; describe('IconText', () => { it('renders with all props set', () => { - const wrapper = shallow(( - - )); + const wrapper = shallow(} text="Test" />); expect(wrapper).toMatchSnapshot(); }); }); diff --git a/ui/src/common/components/IconText/__tests__/__snapshots__/IconText.test.jsx.snap b/ui/src/common/components/IconText/__tests__/__snapshots__/IconText.test.jsx.snap index 3bc49e5948..5bea2d379c 100644 --- a/ui/src/common/components/IconText/__tests__/__snapshots__/IconText.test.jsx.snap +++ b/ui/src/common/components/IconText/__tests__/__snapshots__/IconText.test.jsx.snap @@ -4,10 +4,11 @@ exports[`IconText renders with all props set 1`] = ` - + > + + Test `; diff --git a/ui/src/common/components/ListItemAction/__tests__/ListItemAction.test.jsx b/ui/src/common/components/ListItemAction/__tests__/ListItemAction.test.jsx index c5bf3f3166..0b6e437eac 100644 --- a/ui/src/common/components/ListItemAction/__tests__/ListItemAction.test.jsx +++ b/ui/src/common/components/ListItemAction/__tests__/ListItemAction.test.jsx @@ -1,6 +1,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { Button } from 'antd'; +import { ExpandOutlined } from '@ant-design/icons'; import IconText from '../../IconText'; import ListItemAction from '../ListItemAction'; @@ -10,7 +11,7 @@ describe('ListItemAction', () => { const wrapper = shallow( ); diff --git a/ui/src/common/components/ListItemAction/__tests__/__snapshots__/ListItemAction.test.jsx.snap b/ui/src/common/components/ListItemAction/__tests__/__snapshots__/ListItemAction.test.jsx.snap index ea2cdc01b9..8cfec6528e 100644 --- a/ui/src/common/components/ListItemAction/__tests__/__snapshots__/ListItemAction.test.jsx.snap +++ b/ui/src/common/components/ListItemAction/__tests__/__snapshots__/ListItemAction.test.jsx.snap @@ -11,8 +11,8 @@ exports[`ListItemAction renders 1`] = ` loading={false} > } text="cite" - type="export" /> diff --git a/ui/src/common/components/Logo/__tests__/__snapshots__/Logo.test.jsx.snap b/ui/src/common/components/Logo/__tests__/__snapshots__/Logo.test.jsx.snap index b123c6ce38..bfa3349c6b 100644 --- a/ui/src/common/components/Logo/__tests__/__snapshots__/Logo.test.jsx.snap +++ b/ui/src/common/components/Logo/__tests__/__snapshots__/Logo.test.jsx.snap @@ -3,7 +3,6 @@ exports[`Logo renders 1`] = `
- +
{children}
diff --git a/ui/src/common/components/MultiSelectAggregation/MultiSelectAggregation.jsx b/ui/src/common/components/MultiSelectAggregation/MultiSelectAggregation.jsx index 1974e752f9..349a4a9b7d 100644 --- a/ui/src/common/components/MultiSelectAggregation/MultiSelectAggregation.jsx +++ b/ui/src/common/components/MultiSelectAggregation/MultiSelectAggregation.jsx @@ -28,7 +28,7 @@ class MultiSelectAggregation extends Component { {name}} + placeholder={name} onChange={onChange} value={selections} options={selectOptions} diff --git a/ui/src/common/components/MultiSelectAggregation/MultiSelectAggregation.scss b/ui/src/common/components/MultiSelectAggregation/MultiSelectAggregation.scss index f9d3c9ef7b..892bc87b29 100644 --- a/ui/src/common/components/MultiSelectAggregation/MultiSelectAggregation.scss +++ b/ui/src/common/components/MultiSelectAggregation/MultiSelectAggregation.scss @@ -1,5 +1,5 @@ .__MultiSelectAggregation__ { - .placeholder { - color: $text-color; + .ant-select-selection-placeholder { + opacity: 1; } } diff --git a/ui/src/common/components/MultiSelectAggregation/__tests__/__snapshots__/MultiSelectAggregation.test.jsx.snap b/ui/src/common/components/MultiSelectAggregation/__tests__/__snapshots__/MultiSelectAggregation.test.jsx.snap index e21de70129..c1d8591215 100644 --- a/ui/src/common/components/MultiSelectAggregation/__tests__/__snapshots__/MultiSelectAggregation.test.jsx.snap +++ b/ui/src/common/components/MultiSelectAggregation/__tests__/__snapshots__/MultiSelectAggregation.test.jsx.snap @@ -20,13 +20,7 @@ exports[`MultiSelectAggregation renders 1`] = ` }, ] } - placeholder={ - - Test - - } + placeholder="Test" value={ Array [ "bucket1", @@ -56,13 +50,7 @@ exports[`MultiSelectAggregation renders with custom display values if configured }, ] } - placeholder={ - - Test - - } + placeholder="Test" value={ Array [ "bucket1", diff --git a/ui/src/common/components/SelectBox.jsx b/ui/src/common/components/SelectBox.jsx index 4fb74c6f83..159d1922d5 100644 --- a/ui/src/common/components/SelectBox.jsx +++ b/ui/src/common/components/SelectBox.jsx @@ -8,15 +8,15 @@ class SelectBox extends Component { return ( diff --git a/ui/src/common/components/Suggester.jsx b/ui/src/common/components/Suggester.jsx index 2602b4229e..f7c7c4be41 100644 --- a/ui/src/common/components/Suggester.jsx +++ b/ui/src/common/components/Suggester.jsx @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { AutoComplete, Input } from 'antd'; +import { AutoComplete } from 'antd'; import debounce from 'lodash.debounce'; import http from '../http'; @@ -42,17 +42,18 @@ class Suggester extends Component { renderSuggestions() { const { results } = this.state; const { renderResultItem, extractItemCompletionValue } = this.props; - return results.map(result => ( - - {renderResultItem - ? renderResultItem(result) - : extractItemCompletionValue(result)} - - )); + return results.map(result => { + const completionValue = extractItemCompletionValue(result); + return ( + + {renderResultItem ? renderResultItem(result) : completionValue} + + ); + }); } render() { @@ -63,17 +64,9 @@ class Suggester extends Component { pidType, ...autoCompleteProps } = this.props; - - const dataTestId = autoCompleteProps['data-test-id']; - delete autoCompleteProps['data-test-id']; return ( - - + + {this.renderSuggestions()} ); } diff --git a/ui/src/common/components/TabNameWithCount/TabNameWithCount.jsx b/ui/src/common/components/TabNameWithCount/TabNameWithCount.jsx index 86480f268a..8911619b4d 100644 --- a/ui/src/common/components/TabNameWithCount/TabNameWithCount.jsx +++ b/ui/src/common/components/TabNameWithCount/TabNameWithCount.jsx @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { Icon } from 'antd'; +import { LoadingOutlined } from '@ant-design/icons'; import EventTracker from '../EventTracker'; @@ -14,7 +14,7 @@ class TabNameWithCount extends Component { {loading ? ( - + ) : ( count != null && ({count}) diff --git a/ui/src/common/components/TabNameWithCount/__tests__/__snapshots__/TabNameWithCount.test.jsx.snap b/ui/src/common/components/TabNameWithCount/__tests__/__snapshots__/TabNameWithCount.test.jsx.snap index b409e8f2e8..e1474feceb 100644 --- a/ui/src/common/components/TabNameWithCount/__tests__/__snapshots__/TabNameWithCount.test.jsx.snap +++ b/ui/src/common/components/TabNameWithCount/__tests__/__snapshots__/TabNameWithCount.test.jsx.snap @@ -39,10 +39,9 @@ exports[`TabNameWithCount does not display count if loading is true 1`] = ` - @@ -66,10 +65,9 @@ exports[`TabNameWithCount renders when loading true 1`] = ` - diff --git a/ui/src/common/components/UserFeedback/UserFeedback.jsx b/ui/src/common/components/UserFeedback/UserFeedback.jsx index 6a054ddcf0..c6dcb0fa9a 100644 --- a/ui/src/common/components/UserFeedback/UserFeedback.jsx +++ b/ui/src/common/components/UserFeedback/UserFeedback.jsx @@ -1,4 +1,5 @@ import React, { Component } from 'react'; +import { MessageOutlined } from '@ant-design/icons'; import { Modal, Button, Rate, Input, Alert } from 'antd'; import './UserFeedback.scss'; @@ -163,7 +164,7 @@ class UserFeedback extends Component { className="feedback-button" type="primary" size="large" - icon="message" + icon={} onClick={this.onFeedbackClick} > Feedback} /> diff --git a/ui/src/common/components/UserFeedback/__tests__/__snapshots__/UserFeedback.test.jsx.snap b/ui/src/common/components/UserFeedback/__tests__/__snapshots__/UserFeedback.test.jsx.snap index f87379f0c0..ecf8db65b5 100644 --- a/ui/src/common/components/UserFeedback/__tests__/__snapshots__/UserFeedback.test.jsx.snap +++ b/ui/src/common/components/UserFeedback/__tests__/__snapshots__/UserFeedback.test.jsx.snap @@ -9,7 +9,7 @@ exports[`UserFeedback calls trackEvent with feedback on modal Ok and renders tha className="feedback-button" ghost={false} htmlType="button" - icon="message" + icon={} loading={false} onClick={[Function]} size="large" @@ -70,7 +70,7 @@ exports[`UserFeedback renders 1`] = ` className="feedback-button" ghost={false} htmlType="button" - icon="message" + icon={} loading={false} onClick={[Function]} size="large" @@ -109,12 +109,7 @@ exports[`UserFeedback renders 1`] = `
- } + character={} onChange={[Function]} value={0} /> @@ -150,7 +145,7 @@ exports[`UserFeedback renders when tracker is blocked 1`] = ` className="feedback-button" ghost={false} htmlType="button" - icon="message" + icon={} loading={false} onClick={[Function]} size="large" @@ -223,12 +218,7 @@ exports[`UserFeedback renders when tracker is blocked 1`] = `
- } + character={} disabled={true} onChange={[Function]} value={0} diff --git a/ui/src/common/components/__tests__/__snapshots__/AggregationBox.test.jsx.snap b/ui/src/common/components/__tests__/__snapshots__/AggregationBox.test.jsx.snap index 6260d722aa..4cf2777901 100644 --- a/ui/src/common/components/__tests__/__snapshots__/AggregationBox.test.jsx.snap +++ b/ui/src/common/components/__tests__/__snapshots__/AggregationBox.test.jsx.snap @@ -9,7 +9,9 @@ exports[`AggregationBox renders AggreagationBox with action 1`] = ` justify="space-between" type="flex" > - +

@@ -26,9 +28,13 @@ exports[`AggregationBox renders AggreagationBox with action 1`] = ` className="w-100" gutter={0} > -
- Defenders -
+ +
+ Defenders +
+

`; @@ -42,7 +48,9 @@ exports[`AggregationBox renders AggreagationBox with empty string name 1`] = ` justify="space-between" type="flex" > - +

@@ -57,9 +65,13 @@ exports[`AggregationBox renders AggreagationBox with empty string name 1`] = ` className="w-100" gutter={0} > -
- Defenders -
+ +
+ Defenders +
+ `; @@ -73,7 +85,9 @@ exports[`AggregationBox renders AggreagationBox without action 1`] = ` justify="space-between" type="flex" > - +

@@ -86,9 +100,13 @@ exports[`AggregationBox renders AggreagationBox without action 1`] = ` className="w-100" gutter={0} > -
- Defenders -
+ +
+ Defenders +
+ `; @@ -102,7 +120,9 @@ exports[`AggregationBox renders AggreagationBox without children and with action justify="space-between" type="flex" > - +

@@ -118,7 +138,11 @@ exports[`AggregationBox renders AggreagationBox without children and with action + > + + `; @@ -131,7 +155,9 @@ exports[`AggregationBox renders AggreagationBox without children and without act justify="space-between" type="flex" > - +

@@ -143,6 +169,10 @@ exports[`AggregationBox renders AggreagationBox without children and without act + > + + `; diff --git a/ui/src/common/components/__tests__/__snapshots__/AggregationFilters.test.jsx.snap b/ui/src/common/components/__tests__/__snapshots__/AggregationFilters.test.jsx.snap index e5771c4559..68e851192f 100644 --- a/ui/src/common/components/__tests__/__snapshots__/AggregationFilters.test.jsx.snap +++ b/ui/src/common/components/__tests__/__snapshots__/AggregationFilters.test.jsx.snap @@ -11,7 +11,6 @@ exports[`AggregationFilters does not render aggregations with empty buckets 1`] > } title={ - - + } /> diff --git a/ui/src/common/components/__tests__/__snapshots__/CollaborationLink.test.jsx.snap b/ui/src/common/components/__tests__/__snapshots__/CollaborationLink.test.jsx.snap index 1cd0565f61..065bea78d2 100644 --- a/ui/src/common/components/__tests__/__snapshots__/CollaborationLink.test.jsx.snap +++ b/ui/src/common/components/__tests__/__snapshots__/CollaborationLink.test.jsx.snap @@ -2,7 +2,6 @@ exports[`CollaborationLink renders with collaboration 1`] = ` Alias Investigations diff --git a/ui/src/common/components/__tests__/__snapshots__/ContactList.test.jsx.snap b/ui/src/common/components/__tests__/__snapshots__/ContactList.test.jsx.snap index cfd93bace1..b02a3a3757 100644 --- a/ui/src/common/components/__tests__/__snapshots__/ContactList.test.jsx.snap +++ b/ui/src/common/components/__tests__/__snapshots__/ContactList.test.jsx.snap @@ -91,7 +91,6 @@ exports[`ContactList renders with contacts with record and name 1`] = ` key="John" > John diff --git a/ui/src/common/components/__tests__/__snapshots__/DateRangeFilter.test.jsx.snap b/ui/src/common/components/__tests__/__snapshots__/DateRangeFilter.test.jsx.snap index a705103293..b31e4f4833 100644 --- a/ui/src/common/components/__tests__/__snapshots__/DateRangeFilter.test.jsx.snap +++ b/ui/src/common/components/__tests__/__snapshots__/DateRangeFilter.test.jsx.snap @@ -12,17 +12,12 @@ exports[`DateRangeFilter renders DateRangeFilter with all props set 1`] = ` className="mb2" gutter={0} > - @@ -35,17 +30,12 @@ exports[`DateRangeFilter renders DateRangeFilter with all props set 1`] = ` - @@ -64,17 +54,12 @@ exports[`DateRangeFilter renders DateRangeFilter without range 1`] = ` className="mb2" gutter={0} > - @@ -87,17 +72,12 @@ exports[`DateRangeFilter renders DateRangeFilter without range 1`] = ` - diff --git a/ui/src/common/components/__tests__/__snapshots__/EditRecordAction.test.jsx.snap b/ui/src/common/components/__tests__/__snapshots__/EditRecordAction.test.jsx.snap index 794f61f175..43f300e69f 100644 --- a/ui/src/common/components/__tests__/__snapshots__/EditRecordAction.test.jsx.snap +++ b/ui/src/common/components/__tests__/__snapshots__/EditRecordAction.test.jsx.snap @@ -11,8 +11,8 @@ exports[`EditRecordAction renders edit button with pidType conferences and pidVa href="/editor/record/conferences/1" > } text="edit" - type="edit" /> @@ -30,8 +30,8 @@ exports[`EditRecordAction renders edit button with pidType jobs and pidValue 1`] href="/submissions/jobs/1" > } text="edit" - type="edit" /> @@ -49,8 +49,8 @@ exports[`EditRecordAction renders edit button with pidType jobs and pidValue 2`] href="/submissions/authors/1" > } text="edit" - type="edit" /> @@ -68,8 +68,8 @@ exports[`EditRecordAction renders edit button with pidType literature and pidVal href="/workflows/edit_article/1" > } text="edit" - type="edit" /> diff --git a/ui/src/common/components/__tests__/__snapshots__/EmptyOrChildren.test.jsx.snap b/ui/src/common/components/__tests__/__snapshots__/EmptyOrChildren.test.jsx.snap index 5dd34eb6ea..ae88a433da 100644 --- a/ui/src/common/components/__tests__/__snapshots__/EmptyOrChildren.test.jsx.snap +++ b/ui/src/common/components/__tests__/__snapshots__/EmptyOrChildren.test.jsx.snap @@ -1,14 +1,14 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`EmptyOrChildren does not render children and shows title and description 1`] = ` -} >
this is a rich description
- + `; exports[`EmptyOrChildren renders children if data is non empty List 1`] = ` @@ -42,25 +42,25 @@ exports[`EmptyOrChildren renders children if data is null 1`] = ` `; exports[`EmptyOrChildren renders empty if data is empty List 1`] = ` -} /> `; exports[`EmptyOrChildren renders empty if data is empty Map 1`] = ` -} /> `; exports[`EmptyOrChildren renders empty if data is empty array 1`] = ` -} /> `; exports[`EmptyOrChildren renders empty if data is empty object 1`] = ` -} /> `; diff --git a/ui/src/common/components/__tests__/__snapshots__/HelpIconTooltip.test.jsx.snap b/ui/src/common/components/__tests__/__snapshots__/HelpIconTooltip.test.jsx.snap index f149013e4c..2f230667d0 100644 --- a/ui/src/common/components/__tests__/__snapshots__/HelpIconTooltip.test.jsx.snap +++ b/ui/src/common/components/__tests__/__snapshots__/HelpIconTooltip.test.jsx.snap @@ -10,8 +10,6 @@ exports[`HelpIconTooltip renders with help 1`] = ` title="This is the help" transitionName="zoom-big-fast" > - + `; diff --git a/ui/src/common/components/__tests__/__snapshots__/ModalSuccessResult.test.jsx.snap b/ui/src/common/components/__tests__/__snapshots__/ModalSuccessResult.test.jsx.snap index 0cf560a416..09147d4ee0 100644 --- a/ui/src/common/components/__tests__/__snapshots__/ModalSuccessResult.test.jsx.snap +++ b/ui/src/common/components/__tests__/__snapshots__/ModalSuccessResult.test.jsx.snap @@ -5,10 +5,8 @@ exports[`ModalSuccessResult renders with children 1`] = `
-
diff --git a/ui/src/common/components/__tests__/__snapshots__/SelectBox.test.jsx.snap b/ui/src/common/components/__tests__/__snapshots__/SelectBox.test.jsx.snap index 145e50dc1e..b56a63abeb 100644 --- a/ui/src/common/components/__tests__/__snapshots__/SelectBox.test.jsx.snap +++ b/ui/src/common/components/__tests__/__snapshots__/SelectBox.test.jsx.snap @@ -2,53 +2,63 @@ exports[`SelectBox render initial state with all props set 1`] = ` `; exports[`SelectBox render initial state with data-test-id 1`] = ` `; diff --git a/ui/src/common/components/__tests__/__snapshots__/Suggester.test.jsx.snap b/ui/src/common/components/__tests__/__snapshots__/Suggester.test.jsx.snap index c0636adf18..2e18c1c2de 100644 --- a/ui/src/common/components/__tests__/__snapshots__/Suggester.test.jsx.snap +++ b/ui/src/common/components/__tests__/__snapshots__/Suggester.test.jsx.snap @@ -1,171 +1,116 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`Suggester does not render results onSearch without waiting for debounce 1`] = ` - - - +/> `; exports[`Suggester renders empty if request fails 1`] = ` - - - +/> `; exports[`Suggester renders results onSearch 1`] = ` - - Result 1 - , - , - ] - } - filterOption={false} + - - + + + `; exports[`Suggester renders results with custom completion value 1`] = ` - - Result 1 - Extra 1 - , - , - ] - } - filterOption={false} + - - + + + `; exports[`Suggester renders results with custom result template 1`] = ` - - - Result 1 - - - Extra 1 - - - , - , - ] - } - filterOption={false} + - - + + + `; diff --git a/ui/src/common/layouts/Footer/__tests__/__snapshots__/Footer.test.jsx.snap b/ui/src/common/layouts/Footer/__tests__/__snapshots__/Footer.test.jsx.snap index 76fd0ee5bf..88e8b303e1 100644 --- a/ui/src/common/layouts/Footer/__tests__/__snapshots__/Footer.test.jsx.snap +++ b/ui/src/common/layouts/Footer/__tests__/__snapshots__/Footer.test.jsx.snap @@ -1,7 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`Footer renders 1`] = ` - - + `; diff --git a/ui/src/common/layouts/Header/__tests__/__snapshots__/Header.test.jsx.snap b/ui/src/common/layouts/Header/__tests__/__snapshots__/Header.test.jsx.snap index ef28126dff..2f608a7faf 100644 --- a/ui/src/common/layouts/Header/__tests__/__snapshots__/Header.test.jsx.snap +++ b/ui/src/common/layouts/Header/__tests__/__snapshots__/Header.test.jsx.snap @@ -7,7 +7,7 @@ exports[`Header renders with Banner and Ribbon if it is on beta page 1`] = ` - - +
`; @@ -85,7 +85,7 @@ exports[`Header renders with search box if it is not on home or submission 1`] = className="__Header__" > - - + `; @@ -163,7 +163,7 @@ exports[`Header renders without search box if it is on homepage \`/\` 1`] = ` className="__Header__" > - - + `; @@ -239,7 +239,7 @@ exports[`Header renders without search box if it is on submission page 1`] = ` className="__Header__" > - - + `; diff --git a/ui/src/common/layouts/Header/__tests__/__snapshots__/HeaderMenu.test.jsx.snap b/ui/src/common/layouts/Header/__tests__/__snapshots__/HeaderMenu.test.jsx.snap index 560510aa9a..52c2680916 100644 --- a/ui/src/common/layouts/Header/__tests__/__snapshots__/HeaderMenu.test.jsx.snap +++ b/ui/src/common/layouts/Header/__tests__/__snapshots__/HeaderMenu.test.jsx.snap @@ -15,7 +15,6 @@ exports[`HeaderMenu displays Login link instead of My Account if user is not log key="submit.author" > Author @@ -25,7 +24,6 @@ exports[`HeaderMenu displays Login link instead of My Account if user is not log key="submit.job" > Job @@ -35,7 +33,6 @@ exports[`HeaderMenu displays Login link instead of My Account if user is not log key="submit.literature" > Literature @@ -45,7 +42,6 @@ exports[`HeaderMenu displays Login link instead of My Account if user is not log key="submit.conference" > Conference @@ -89,7 +85,6 @@ exports[`HeaderMenu displays Login link instead of My Account if user is not log key="login-logout" > Login @@ -113,7 +108,6 @@ exports[`HeaderMenu does not show some tool links if logged in user is not super key="submit.author" > Author @@ -123,7 +117,6 @@ exports[`HeaderMenu does not show some tool links if logged in user is not super key="submit.job" > Job @@ -133,7 +126,6 @@ exports[`HeaderMenu does not show some tool links if logged in user is not super key="submit.literature" > Literature @@ -143,7 +135,6 @@ exports[`HeaderMenu does not show some tool links if logged in user is not super key="submit.conference" > Conference @@ -211,7 +202,6 @@ exports[`HeaderMenu shows all tool links if logged in user is cataloger 1`] = ` key="submit.author" > Author @@ -221,7 +211,6 @@ exports[`HeaderMenu shows all tool links if logged in user is cataloger 1`] = ` key="submit.job" > Job @@ -231,7 +220,6 @@ exports[`HeaderMenu shows all tool links if logged in user is cataloger 1`] = ` key="submit.literature" > Literature @@ -241,7 +229,6 @@ exports[`HeaderMenu shows all tool links if logged in user is cataloger 1`] = ` key="submit.conference" > Conference diff --git a/ui/src/conferences/components/ConferenceItem.jsx b/ui/src/conferences/components/ConferenceItem.jsx index 4756e41fd2..80a55c7a30 100644 --- a/ui/src/conferences/components/ConferenceItem.jsx +++ b/ui/src/conferences/components/ConferenceItem.jsx @@ -2,6 +2,7 @@ import React, { Component } from 'react'; import { Link } from 'react-router-dom'; import PropTypes from 'prop-types'; import { Map } from 'immutable'; +import { LoginOutlined } from '@ant-design/icons'; import { Row, Col } from 'antd'; import EditRecordAction from '../../common/components/EditRecordAction'; @@ -59,7 +60,7 @@ class ConferenceItem extends Component { 'contribution', contributionsCount )}`} - type="login" + icon={} /> diff --git a/ui/src/conferences/components/ConferenceWebsitesAction.jsx b/ui/src/conferences/components/ConferenceWebsitesAction.jsx index 629844179d..8fa9fe3931 100644 --- a/ui/src/conferences/components/ConferenceWebsitesAction.jsx +++ b/ui/src/conferences/components/ConferenceWebsitesAction.jsx @@ -2,6 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { List } from 'immutable'; import { Menu } from 'antd'; +import { LinkOutlined } from '@ant-design/icons'; import ExternalLink from '../../common/components/ExternalLink'; import { removeProtocolAndWwwFromUrl } from '../../common/utils'; @@ -23,7 +24,7 @@ function renderWebsiteAction(website, title) { return {title}; } -const ACTION_TITLE = ; +const ACTION_TITLE = } text="website" />; function ConferenceWebsitesAction({ websites }) { return ( diff --git a/ui/src/conferences/components/ProceedingsAction.jsx b/ui/src/conferences/components/ProceedingsAction.jsx index 69d36df4fc..c939c132a0 100644 --- a/ui/src/conferences/components/ProceedingsAction.jsx +++ b/ui/src/conferences/components/ProceedingsAction.jsx @@ -2,6 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { List, Map } from 'immutable'; import { Menu } from 'antd'; +import { BookOutlined } from '@ant-design/icons'; import ExternalLink from '../../common/components/ExternalLink'; import ActionsDropdownOrAction from '../../common/components/ActionsDropdownOrAction'; @@ -36,7 +37,7 @@ function renderProceedingAction(proceeding, title) { ); } -const ACTION_TITLE = ; +const ACTION_TITLE = } />; function ProceedingsAction({ proceedings }) { return ( diff --git a/ui/src/conferences/components/__tests__/__snapshots__/ConferenceItem.test.jsx.snap b/ui/src/conferences/components/__tests__/__snapshots__/ConferenceItem.test.jsx.snap index a3c4bc4a87..c3eebf959f 100644 --- a/ui/src/conferences/components/__tests__/__snapshots__/ConferenceItem.test.jsx.snap +++ b/ui/src/conferences/components/__tests__/__snapshots__/ConferenceItem.test.jsx.snap @@ -35,15 +35,14 @@ exports[`ConferenceItem renders with all props set 1`] = ` } rightActions={ - } text="3 contributions" - type="login" /> - + } > @@ -54,7 +53,6 @@ exports[`ConferenceItem renders with all props set 1`] = ` @@ -126,7 +124,6 @@ exports[`ConferenceItem renders with only needed props 1`] = ` diff --git a/ui/src/conferences/components/__tests__/__snapshots__/ConferenceSeries.test.jsx.snap b/ui/src/conferences/components/__tests__/__snapshots__/ConferenceSeries.test.jsx.snap index cfdd0994fb..5fc8f5a840 100644 --- a/ui/src/conferences/components/__tests__/__snapshots__/ConferenceSeries.test.jsx.snap +++ b/ui/src/conferences/components/__tests__/__snapshots__/ConferenceSeries.test.jsx.snap @@ -14,7 +14,6 @@ exports[`ConferenceSeries renders several series 1`] = ` art of the Conference 1 @@ -32,7 +31,6 @@ exports[`ConferenceSeries renders several series 1`] = ` conference in the Conference 2 @@ -50,7 +48,6 @@ exports[`ConferenceSeries renders several series 1`] = ` art of the Conference 3 @@ -76,7 +73,6 @@ exports[`ConferenceSeries renders with name and number 1`] = ` conference in the Conference Name @@ -102,7 +98,6 @@ exports[`ConferenceSeries renders with only name 1`] = ` art of the Conference Name diff --git a/ui/src/conferences/components/__tests__/__snapshots__/ConferenceWebsitesAction.test.jsx.snap b/ui/src/conferences/components/__tests__/__snapshots__/ConferenceWebsitesAction.test.jsx.snap index 2ca143448a..8c467264bc 100644 --- a/ui/src/conferences/components/__tests__/__snapshots__/ConferenceWebsitesAction.test.jsx.snap +++ b/ui/src/conferences/components/__tests__/__snapshots__/ConferenceWebsitesAction.test.jsx.snap @@ -6,8 +6,8 @@ exports[`ConferenceWebsitesAction renders single url 1`] = ` href="https://author.wordpress.com" > } text="website" - type="link" /> @@ -25,8 +25,8 @@ exports[`ConferenceWebsitesAction renders urls with and without description 1`] loading={false} > } text="website" - type="link" /> } diff --git a/ui/src/conferences/components/__tests__/__snapshots__/ProceedingsAction.test.jsx.snap b/ui/src/conferences/components/__tests__/__snapshots__/ProceedingsAction.test.jsx.snap index d83f18b60e..23d585b82c 100644 --- a/ui/src/conferences/components/__tests__/__snapshots__/ProceedingsAction.test.jsx.snap +++ b/ui/src/conferences/components/__tests__/__snapshots__/ProceedingsAction.test.jsx.snap @@ -12,8 +12,8 @@ exports[`ProceedingsAction renders proceedings 1`] = ` loading={false} > } text="proceedings" - type="book" /> } @@ -55,8 +55,8 @@ exports[`ProceedingsAction renders single item 1`] = ` href="/literature/12345" > } text="proceedings" - type="book" /> diff --git a/ui/src/conferences/containers/DetailPageContainer.jsx b/ui/src/conferences/containers/DetailPageContainer.jsx index 9d7bd09aed..59cbd4efdf 100644 --- a/ui/src/conferences/containers/DetailPageContainer.jsx +++ b/ui/src/conferences/containers/DetailPageContainer.jsx @@ -92,37 +92,51 @@ function DetailPage({ record }) { {cnum && ` (${cnum})`} - - - - - - - - {description} - - - - {series && } - - - - - - - - - - - - - - - - + {inspireCategories && ( + + + + + + )} + {description && ( + + + {description} + + + )} + {series && ( + + + + + + )} + {contacts && ( + + + + + + )} + {publicNotes && ( + + + + + + )} + {keywords && ( + + + + + + )} diff --git a/ui/src/errors/components/ErrorPage.jsx b/ui/src/errors/components/ErrorPage.jsx index 7d98e04724..a5e7356535 100644 --- a/ui/src/errors/components/ErrorPage.jsx +++ b/ui/src/errors/components/ErrorPage.jsx @@ -8,19 +8,19 @@ class ErrorPage extends Component { return ( - +

{message}

 {detail && ( - +

{detail}

 )} - + ERROR diff --git a/ui/src/errors/components/__tests__/__snapshots__/ErrorPage.test.jsx.snap b/ui/src/errors/components/__tests__/__snapshots__/ErrorPage.test.jsx.snap index 3e191044bc..4ad0cf27d1 100644 --- a/ui/src/errors/components/__tests__/__snapshots__/ErrorPage.test.jsx.snap +++ b/ui/src/errors/components/__tests__/__snapshots__/ErrorPage.test.jsx.snap @@ -10,7 +10,9 @@ exports[`ErrorPage renders with all props 1`] = ` - +

@@ -21,7 +23,9 @@ exports[`ErrorPage renders with all props 1`] = ` - +

@@ -34,7 +38,9 @@ exports[`ErrorPage renders with all props 1`] = ` - + ERROR - +

@@ -65,7 +73,9 @@ exports[`ErrorPage renders with default detail 1`] = ` - + ERROR ), - filterIcon: , + filterIcon: , filterDropdownVisible: isErrorFilterDropdownVisible, onFilterDropdownVisibleChange: this.onErrorFilterDropdownVisibleChange, width: '70%', @@ -161,7 +162,7 @@ class ExceptionsTable extends Component { focused={isRecidFilterFocused} /> ), - filterIcon: , + filterIcon: , filterDropdownVisible: isRecidFilterDropdownVisible, onFilterDropdownVisibleChange: this.onRecidFilterDropdownVisibleChange, render: text => { diff --git a/ui/src/holdingpen/components/__tests__/__snapshots__/ExceptionsTable.test.jsx.snap b/ui/src/holdingpen/components/__tests__/__snapshots__/ExceptionsTable.test.jsx.snap index 2bd3682bc5..01bb81b29f 100644 --- a/ui/src/holdingpen/components/__tests__/__snapshots__/ExceptionsTable.test.jsx.snap +++ b/ui/src/holdingpen/components/__tests__/__snapshots__/ExceptionsTable.test.jsx.snap @@ -3,7 +3,6 @@ exports[`ExceptionsTable renders all exceptions on clear error search 1`] = ` , "filterDropdownVisible": false, - "filterIcon": , + "filterIcon": , "onFilterDropdownVisibleChange": [Function], "render": [Function], "title": "Error", @@ -46,9 +43,7 @@ exports[`ExceptionsTable renders all exceptions on clear error search 1`] = ` placeholder="Go to recid" />, "filterDropdownVisible": false, - "filterIcon": , + "filterIcon": , "onFilterDropdownVisibleChange": [Function], "render": [Function], "title": "Record", @@ -75,9 +70,7 @@ exports[`ExceptionsTable renders all exceptions on clear error search 1`] = ` ] } expandedRowRender={[Function]} - indentSize={20} loading={false} - locale={Object {}} pagination={ Object { "pageSize": 25, @@ -85,22 +78,12 @@ exports[`ExceptionsTable renders all exceptions on clear error search 1`] = ` } rowClassName="exceptions-table-row" rowKey="recid" - showHeader={true} - size="default" - sortDirections={ - Array [ - "ascend", - "descend", - ] - } - useFixedHeader={false} /> `; exports[`ExceptionsTable renders all exceptions on clear recid search 1`] = `
, "filterDropdownVisible": false, - "filterIcon": , + "filterIcon": , "onFilterDropdownVisibleChange": [Function], "render": [Function], "title": "Error", @@ -143,9 +124,7 @@ exports[`ExceptionsTable renders all exceptions on clear recid search 1`] = ` placeholder="Go to recid" />, "filterDropdownVisible": false, - "filterIcon": , + "filterIcon": , "onFilterDropdownVisibleChange": [Function], "render": [Function], "title": "Record", @@ -172,9 +151,7 @@ exports[`ExceptionsTable renders all exceptions on clear recid search 1`] = ` ] } expandedRowRender={[Function]} - indentSize={20} loading={false} - locale={Object {}} pagination={ Object { "pageSize": 25, @@ -182,22 +159,12 @@ exports[`ExceptionsTable renders all exceptions on clear recid search 1`] = ` } rowClassName="exceptions-table-row" rowKey="recid" - showHeader={true} - size="default" - sortDirections={ - Array [ - "ascend", - "descend", - ] - } - useFixedHeader={false} /> `; exports[`ExceptionsTable renders filtered results on error search 1`] = `
, "filterDropdownVisible": false, - "filterIcon": , + "filterIcon": , "onFilterDropdownVisibleChange": [Function], "render": [Function], "title": "Error", @@ -240,9 +205,7 @@ exports[`ExceptionsTable renders filtered results on error search 1`] = ` placeholder="Go to recid" />, "filterDropdownVisible": false, - "filterIcon": , + "filterIcon": , "onFilterDropdownVisibleChange": [Function], "render": [Function], "title": "Record", @@ -264,9 +227,7 @@ exports[`ExceptionsTable renders filtered results on error search 1`] = ` ] } expandedRowRender={[Function]} - indentSize={20} loading={false} - locale={Object {}} pagination={ Object { "pageSize": 25, @@ -274,22 +235,12 @@ exports[`ExceptionsTable renders filtered results on error search 1`] = ` } rowClassName="exceptions-table-row" rowKey="recid" - showHeader={true} - size="default" - sortDirections={ - Array [ - "ascend", - "descend", - ] - } - useFixedHeader={false} /> `; exports[`ExceptionsTable renders no results on error search if nothing matches 1`] = `
, "filterDropdownVisible": false, - "filterIcon": , + "filterIcon": , "onFilterDropdownVisibleChange": [Function], "render": [Function], "title": "Error", @@ -332,9 +281,7 @@ exports[`ExceptionsTable renders no results on error search if nothing matches 1 placeholder="Go to recid" />, "filterDropdownVisible": false, - "filterIcon": , + "filterIcon": , "onFilterDropdownVisibleChange": [Function], "render": [Function], "title": "Record", @@ -343,9 +290,7 @@ exports[`ExceptionsTable renders no results on error search if nothing matches 1 } dataSource={Array []} expandedRowRender={[Function]} - indentSize={20} loading={false} - locale={Object {}} pagination={ Object { "pageSize": 25, @@ -353,22 +298,12 @@ exports[`ExceptionsTable renders no results on error search if nothing matches 1 } rowClassName="exceptions-table-row" rowKey="recid" - showHeader={true} - size="default" - sortDirections={ - Array [ - "ascend", - "descend", - ] - } - useFixedHeader={false} /> `; exports[`ExceptionsTable renders no results on recid search if there is no exact match 1`] = `
, "filterDropdownVisible": false, - "filterIcon": , + "filterIcon": , "onFilterDropdownVisibleChange": [Function], "render": [Function], "title": "Error", @@ -411,9 +344,7 @@ exports[`ExceptionsTable renders no results on recid search if there is no exact placeholder="Go to recid" />, "filterDropdownVisible": false, - "filterIcon": , + "filterIcon": , "onFilterDropdownVisibleChange": [Function], "render": [Function], "title": "Record", @@ -422,9 +353,7 @@ exports[`ExceptionsTable renders no results on recid search if there is no exact } dataSource={Array []} expandedRowRender={[Function]} - indentSize={20} loading={false} - locale={Object {}} pagination={ Object { "pageSize": 25, @@ -432,22 +361,12 @@ exports[`ExceptionsTable renders no results on recid search if there is no exact } rowClassName="exceptions-table-row" rowKey="recid" - showHeader={true} - size="default" - sortDirections={ - Array [ - "ascend", - "descend", - ] - } - useFixedHeader={false} /> `; exports[`ExceptionsTable renders single exception on recid search if there is exact match 1`] = `
, "filterDropdownVisible": false, - "filterIcon": , + "filterIcon": , "onFilterDropdownVisibleChange": [Function], "render": [Function], "title": "Error", @@ -490,9 +407,7 @@ exports[`ExceptionsTable renders single exception on recid search if there is ex placeholder="Go to recid" />, "filterDropdownVisible": false, - "filterIcon": , + "filterIcon": , "onFilterDropdownVisibleChange": [Function], "render": [Function], "title": "Record", @@ -509,9 +424,7 @@ exports[`ExceptionsTable renders single exception on recid search if there is ex ] } expandedRowRender={[Function]} - indentSize={20} loading={false} - locale={Object {}} pagination={ Object { "pageSize": 25, @@ -519,22 +432,12 @@ exports[`ExceptionsTable renders single exception on recid search if there is ex } rowClassName="exceptions-table-row" rowKey="recid" - showHeader={true} - size="default" - sortDirections={ - Array [ - "ascend", - "descend", - ] - } - useFixedHeader={false} /> `; exports[`ExceptionsTable renders when loading is true 1`] = `
, "filterDropdownVisible": false, - "filterIcon": , + "filterIcon": , "onFilterDropdownVisibleChange": [Function], "render": [Function], "title": "Error", @@ -568,9 +469,7 @@ exports[`ExceptionsTable renders when loading is true 1`] = ` placeholder="Go to recid" />, "filterDropdownVisible": false, - "filterIcon": , + "filterIcon": , "onFilterDropdownVisibleChange": [Function], "render": [Function], "title": "Record", @@ -579,9 +478,7 @@ exports[`ExceptionsTable renders when loading is true 1`] = ` } dataSource={Array []} expandedRowRender={[Function]} - indentSize={20} loading={true} - locale={Object {}} pagination={ Object { "pageSize": 25, @@ -589,22 +486,12 @@ exports[`ExceptionsTable renders when loading is true 1`] = ` } rowClassName="exceptions-table-row" rowKey="recid" - showHeader={true} - size="default" - sortDirections={ - Array [ - "ascend", - "descend", - ] - } - useFixedHeader={false} /> `; exports[`ExceptionsTable renders with exceptions 1`] = `
, "filterDropdownVisible": false, - "filterIcon": , + "filterIcon": , "onFilterDropdownVisibleChange": [Function], "render": [Function], "title": "Error", @@ -647,9 +532,7 @@ exports[`ExceptionsTable renders with exceptions 1`] = ` placeholder="Go to recid" />, "filterDropdownVisible": false, - "filterIcon": , + "filterIcon": , "onFilterDropdownVisibleChange": [Function], "render": [Function], "title": "Record", @@ -676,9 +559,7 @@ exports[`ExceptionsTable renders with exceptions 1`] = ` ] } expandedRowRender={[Function]} - indentSize={20} loading={false} - locale={Object {}} pagination={ Object { "pageSize": 25, @@ -686,14 +567,5 @@ exports[`ExceptionsTable renders with exceptions 1`] = ` } rowClassName="exceptions-table-row" rowKey="recid" - showHeader={true} - size="default" - sortDirections={ - Array [ - "ascend", - "descend", - ] - } - useFixedHeader={false} /> `; diff --git a/ui/src/home/__tests__/__snapshots__/index.test.jsx.snap b/ui/src/home/__tests__/__snapshots__/index.test.jsx.snap index 496b38bce0..06612b69ca 100644 --- a/ui/src/home/__tests__/__snapshots__/index.test.jsx.snap +++ b/ui/src/home/__tests__/__snapshots__/index.test.jsx.snap @@ -21,7 +21,9 @@ exports[`Home renders home page 1`] = ` className="pt4" gutter={0} > - +

@@ -37,7 +39,9 @@ exports[`Home renders home page 1`] = ` -

+ diff --git a/ui/src/home/components/HowToSearch.jsx b/ui/src/home/components/HowToSearch.jsx index 71dbf783da..6ca5a556e2 100644 --- a/ui/src/home/components/HowToSearch.jsx +++ b/ui/src/home/components/HowToSearch.jsx @@ -1,5 +1,6 @@ import React, { Component } from 'react'; -import { Card, Icon, Button, Modal, Table, Tabs, Tooltip } from 'antd'; +import { InfoCircleTwoTone } from '@ant-design/icons'; +import { Card, Button, Modal, Table, Tabs, Tooltip } from 'antd'; import ExternalLink from '../../common/components/ExternalLink'; import LinkWithEncodedLiteratureQuery from './LinkWithEncodedLiteratureQuery'; @@ -152,7 +153,7 @@ class HowToSearch extends Component { return ( ); diff --git a/ui/src/home/components/__tests__/__snapshots__/HowToSearch.test.jsx.snap b/ui/src/home/components/__tests__/__snapshots__/HowToSearch.test.jsx.snap index de3a0d3f50..f3a559e647 100644 --- a/ui/src/home/components/__tests__/__snapshots__/HowToSearch.test.jsx.snap +++ b/ui/src/home/components/__tests__/__snapshots__/HowToSearch.test.jsx.snap @@ -31,9 +31,6 @@ exports[`HowToSearch renders the components 1`] = ` className="pa3" >
@@ -227,10 +213,7 @@ exports[`HowToSearch renders the components 1`] = ` onClick={[Function]} shape="circle" > - + } diff --git a/ui/src/home/components/__tests__/__snapshots__/LinkWithEncodedLiteratureQuery.test.jsx.snap b/ui/src/home/components/__tests__/__snapshots__/LinkWithEncodedLiteratureQuery.test.jsx.snap index 34fd055b7a..9ecaabecf1 100644 --- a/ui/src/home/components/__tests__/__snapshots__/LinkWithEncodedLiteratureQuery.test.jsx.snap +++ b/ui/src/home/components/__tests__/__snapshots__/LinkWithEncodedLiteratureQuery.test.jsx.snap @@ -2,7 +2,6 @@ exports[`LinkWithEncodedLiteratureQuery renders the component with special characters 1`] = ` this is an encoded query , / ? : @ & = + $ # @@ -11,7 +10,6 @@ exports[`LinkWithEncodedLiteratureQuery renders the component with special chara exports[`LinkWithEncodedLiteratureQuery renders the component without special characters 1`] = ` this is a query diff --git a/ui/src/home/index.jsx b/ui/src/home/index.jsx index d7369af06a..96107dab22 100644 --- a/ui/src/home/index.jsx +++ b/ui/src/home/index.jsx @@ -6,8 +6,9 @@ import HowToSearch from './components/HowToSearch'; import './index.scss'; import DocumentHead from '../common/components/DocumentHead'; -const META_DESCRIPTION = "INSPIRE is the leading information platform for High Energy Physics (HEP) literature which provides users with high quality, curated content covering the entire corpus of HEP literature, authors, data, jobs, conferences, institutions and experiments." -const TITLE = "Home" +const META_DESCRIPTION = + 'INSPIRE is the leading information platform for High Energy Physics (HEP) literature which provides users with high quality, curated content covering the entire corpus of HEP literature, authors, data, jobs, conferences, institutions and experiments.'; +const TITLE = 'Home'; class Home extends Component { render() { @@ -17,7 +18,7 @@ class Home extends Component { - +

Discover High-Energy Physics content

@@ -28,7 +29,7 @@ class Home extends Component { - + diff --git a/ui/src/jobs/components/DeadlineDate.jsx b/ui/src/jobs/components/DeadlineDate.jsx index f6905271a9..ca8d26cc6c 100644 --- a/ui/src/jobs/components/DeadlineDate.jsx +++ b/ui/src/jobs/components/DeadlineDate.jsx @@ -1,6 +1,8 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; +import { ClockCircleOutlined } from '@ant-design/icons'; import moment from 'moment'; + import IconText from '../../common/components/IconText'; class DeadlineDate extends Component { @@ -10,7 +12,7 @@ class DeadlineDate extends Component { return ( } text={`Deadline on ${formattedDeadlineDate}`} /> diff --git a/ui/src/jobs/components/SubscribeJobsModalButton.jsx b/ui/src/jobs/components/SubscribeJobsModalButton.jsx index 28767e7724..79bf91890e 100644 --- a/ui/src/jobs/components/SubscribeJobsModalButton.jsx +++ b/ui/src/jobs/components/SubscribeJobsModalButton.jsx @@ -1,5 +1,6 @@ import React, { Component } from 'react'; -import { Modal, Icon, Alert, Typography } from 'antd'; +import { MailOutlined } from '@ant-design/icons'; +import { Modal, Alert, Typography } from 'antd'; import LinkLikeButton from '../../common/components/LinkLikeButton'; import ResponsiveView from '../../common/components/ResponsiveView'; import subscribeJobMailingList from '../subscribeJobMailingList'; @@ -92,7 +93,7 @@ export default class SubscribeJobsModalButton extends Component { return ( <> - + ( diff --git a/ui/src/jobs/components/__tests__/__snapshots__/DeadlineDate.test.jsx.snap b/ui/src/jobs/components/__tests__/__snapshots__/DeadlineDate.test.jsx.snap index 0e5a3d94c5..b1b15bd650 100644 --- a/ui/src/jobs/components/__tests__/__snapshots__/DeadlineDate.test.jsx.snap +++ b/ui/src/jobs/components/__tests__/__snapshots__/DeadlineDate.test.jsx.snap @@ -3,8 +3,8 @@ exports[`DeadlineDate renders with deadlineDate 1`] = ` } text="Deadline on Mar 12, 2003" - type="clock-circle" /> `; diff --git a/ui/src/jobs/components/__tests__/__snapshots__/JobItem.test.jsx.snap b/ui/src/jobs/components/__tests__/__snapshots__/JobItem.test.jsx.snap index 855c34f6dd..145f4de462 100644 --- a/ui/src/jobs/components/__tests__/__snapshots__/JobItem.test.jsx.snap +++ b/ui/src/jobs/components/__tests__/__snapshots__/JobItem.test.jsx.snap @@ -11,7 +11,6 @@ exports[`JobItem renders full job search result item 1`] = ` - + - + - + - - - - {institutions && ( - - )} - - - - - - - - - {ranks && } - {experiments && } - - - + + + + + {institutions && ( + + )} + + + + + + + + + + + {ranks && } + {experiments && ( + + )} + + + + diff --git a/ui/src/literature/components/CitationSummarySwitch.jsx b/ui/src/literature/components/CitationSummarySwitch.jsx index 19033e9ce8..271597965b 100644 --- a/ui/src/literature/components/CitationSummarySwitch.jsx +++ b/ui/src/literature/components/CitationSummarySwitch.jsx @@ -1,7 +1,8 @@ import React from 'react'; -import { Icon, Switch, Tooltip } from 'antd'; +import { BarChartOutlined } from '@ant-design/icons'; +import { Switch, Tooltip } from 'antd'; -const CHART_ICON = ; +const CHART_ICON = ; function CitationSummarySwitch(props) { const { checked } = props; diff --git a/ui/src/literature/components/CiteAllAction.jsx b/ui/src/literature/components/CiteAllAction.jsx index 635dbcf263..214c179ce4 100644 --- a/ui/src/literature/components/CiteAllAction.jsx +++ b/ui/src/literature/components/CiteAllAction.jsx @@ -1,4 +1,5 @@ import { stringify } from 'qs'; +import { ExportOutlined } from '@ant-design/icons'; import React, { Component } from 'react'; import { Button, Menu, Tooltip } from 'antd'; @@ -51,8 +52,8 @@ class CiteAllAction extends Component { : null } > - ); diff --git a/ui/src/literature/components/CiteModalAction.jsx b/ui/src/literature/components/CiteModalAction.jsx index 561800bd4b..548441729a 100644 --- a/ui/src/literature/components/CiteModalAction.jsx +++ b/ui/src/literature/components/CiteModalAction.jsx @@ -1,6 +1,11 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { Modal, Button, Row, Icon, Alert } from 'antd'; +import { + CopyOutlined, + DownloadOutlined, + ExportOutlined, +} from '@ant-design/icons'; +import { Modal, Button, Row, Alert } from 'antd'; import { CopyToClipboard } from 'react-copy-to-clipboard'; import SelectBox from '../../common/components/SelectBox'; @@ -80,7 +85,7 @@ class CiteModalAction extends Component { @@ -103,11 +108,11 @@ class CiteModalAction extends Component {
{title}; } -const TITLE = ; +const TITLE = } />; function DOILinkAction({ dois }) { return ( diff --git a/ui/src/literature/components/LiteratureItem.jsx b/ui/src/literature/components/LiteratureItem.jsx index c9ec9b9bf3..05ff3c00d0 100644 --- a/ui/src/literature/components/LiteratureItem.jsx +++ b/ui/src/literature/components/LiteratureItem.jsx @@ -2,6 +2,7 @@ import React, { Component, Fragment } from 'react'; import { Link } from 'react-router-dom'; import PropTypes from 'prop-types'; import { Map } from 'immutable'; +import { LoginOutlined, DownloadOutlined } from '@ant-design/icons'; import ArxivEprintList from './ArxivEprintList'; import LiteratureDate from './LiteratureDate'; @@ -53,7 +54,7 @@ class LiteratureItem extends Component { {fullTextLinks && ( } iconText="pdf" trackerEventId="PdfDownload" /> @@ -76,7 +77,7 @@ class LiteratureItem extends Component { 'citation', citationCount )}`} - type="login" + icon={} /> diff --git a/ui/src/literature/components/UrlsAction.jsx b/ui/src/literature/components/UrlsAction.jsx index d2d781ab01..089cd481db 100644 --- a/ui/src/literature/components/UrlsAction.jsx +++ b/ui/src/literature/components/UrlsAction.jsx @@ -16,7 +16,7 @@ function linkToHrefDisplayPair(link) { return [href, display]; } -function UrlsAction({ urls, iconText, iconType, trackerEventId }) { +function UrlsAction({ urls, iconText, icon, trackerEventId }) { const renderUrlsAction = useCallback( (url, title) => ( @@ -40,7 +40,7 @@ function UrlsAction({ urls, iconText, iconType, trackerEventId }) { [trackerEventId] ); - const ACTION_TITLE = ; + const ACTION_TITLE = ; return ( { const wrapper = shallow( } + iconText="download" trackerEventId="PdfDownload" /> ); @@ -35,7 +36,7 @@ describe('UrlsAction', () => { } trackerEventId="PdfDownload" /> ); diff --git a/ui/src/literature/components/__tests__/__snapshots__/CitationSummarySwitch.test.jsx.snap b/ui/src/literature/components/__tests__/__snapshots__/CitationSummarySwitch.test.jsx.snap index 0b0677c0f5..40f6dca8ec 100644 --- a/ui/src/literature/components/__tests__/__snapshots__/CitationSummarySwitch.test.jsx.snap +++ b/ui/src/literature/components/__tests__/__snapshots__/CitationSummarySwitch.test.jsx.snap @@ -12,17 +12,9 @@ exports[`CitationSummarySwitch renders checked 1`] = ` > - } + checkedChildren={} onChange={[MockFunction]} - unCheckedChildren={ - - } + unCheckedChildren={} /> `; @@ -39,17 +31,9 @@ exports[`CitationSummarySwitch renders unchecked 1`] = ` > - } + checkedChildren={} onChange={[MockFunction]} - unCheckedChildren={ - - } + unCheckedChildren={} /> `; diff --git a/ui/src/literature/components/__tests__/__snapshots__/CiteAllAction.test.jsx.snap b/ui/src/literature/components/__tests__/__snapshots__/CiteAllAction.test.jsx.snap index 0eda7a4edb..83abd56fe4 100644 --- a/ui/src/literature/components/__tests__/__snapshots__/CiteAllAction.test.jsx.snap +++ b/ui/src/literature/components/__tests__/__snapshots__/CiteAllAction.test.jsx.snap @@ -20,12 +20,11 @@ exports[`CiteAllAction renders with disabled 1`] = ` disabled={true} ghost={false} htmlType="button" - icon={null} loading={false} > } text="cite all" - type="export" /> @@ -70,12 +69,11 @@ exports[`CiteAllAction renders with less than max citeable records results 1`] = disabled={false} ghost={false} htmlType="button" - icon={null} loading={false} > } text="cite all" - type="export" /> @@ -120,12 +118,11 @@ exports[`CiteAllAction renders with loading 1`] = ` disabled={false} ghost={false} htmlType="button" - icon="loading" - loading={false} + loading={true} > } text="cite all" - type="export" /> diff --git a/ui/src/literature/components/__tests__/__snapshots__/CiteModalAction.test.jsx.snap b/ui/src/literature/components/__tests__/__snapshots__/CiteModalAction.test.jsx.snap index 613379a3e8..84d8ce5f1a 100644 --- a/ui/src/literature/components/__tests__/__snapshots__/CiteModalAction.test.jsx.snap +++ b/ui/src/literature/components/__tests__/__snapshots__/CiteModalAction.test.jsx.snap @@ -16,8 +16,8 @@ exports[`CiteModalAction renders with all props 1`] = ` onClick={[Function]} > } text="cite" - type="export" /> @@ -59,9 +59,7 @@ exports[`CiteModalAction renders with all props 1`] = ` } } > - + Copy to Clipboard @@ -72,9 +70,7 @@ exports[`CiteModalAction renders with all props 1`] = ` loading={false} onClick={[Function]} > - + Download @@ -131,8 +127,8 @@ exports[`CiteModalAction shows an alert with the error message when there is an onClick={[Function]} > } text="cite" - type="export" /> @@ -183,9 +179,7 @@ exports[`CiteModalAction shows an alert with the error message when there is an } } > - + Copy to Clipboard @@ -196,9 +190,7 @@ exports[`CiteModalAction shows an alert with the error message when there is an loading={false} onClick={[Function]} > - + Download diff --git a/ui/src/literature/components/__tests__/__snapshots__/ConferenceInfo.test.jsx.snap b/ui/src/literature/components/__tests__/__snapshots__/ConferenceInfo.test.jsx.snap index f368d41d77..f63bdab31f 100644 --- a/ui/src/literature/components/__tests__/__snapshots__/ConferenceInfo.test.jsx.snap +++ b/ui/src/literature/components/__tests__/__snapshots__/ConferenceInfo.test.jsx.snap @@ -3,7 +3,6 @@ exports[`ConferenceInfo renders with acronyms 1`] = ` 15th Marcel Grossmann Meeting on Recent Developments in Theoretical and Experimental General Relativity, Astrophysics, and Relativistic Field Theories diff --git a/ui/src/literature/components/__tests__/__snapshots__/DOILinkAction.test.jsx.snap b/ui/src/literature/components/__tests__/__snapshots__/DOILinkAction.test.jsx.snap index 6ba4087c53..11701b8f1a 100644 --- a/ui/src/literature/components/__tests__/__snapshots__/DOILinkAction.test.jsx.snap +++ b/ui/src/literature/components/__tests__/__snapshots__/DOILinkAction.test.jsx.snap @@ -6,8 +6,8 @@ exports[`DOILinkAction renders with a doi id 1`] = ` doi="10.1007/s11182-019-01606-1" > } text="DOI" - type="link" /> @@ -25,8 +25,8 @@ exports[`DOILinkAction renders with multiple doi ids 1`] = ` loading={false} > } text="DOI" - type="link" /> } @@ -71,8 +71,8 @@ exports[`DOILinkAction renders with multiple doi ids and material 1`] = ` loading={false} > } text="DOI" - type="link" /> } diff --git a/ui/src/literature/components/__tests__/__snapshots__/DropdownMenu.test.jsx.snap b/ui/src/literature/components/__tests__/__snapshots__/DropdownMenu.test.jsx.snap index 372ba86449..d3df8e3bb2 100644 --- a/ui/src/literature/components/__tests__/__snapshots__/DropdownMenu.test.jsx.snap +++ b/ui/src/literature/components/__tests__/__snapshots__/DropdownMenu.test.jsx.snap @@ -19,7 +19,6 @@ exports[`DropdownMenu renders 1`] = ` } - placement="bottomLeft" > title @@ -46,7 +45,6 @@ exports[`DropdownMenu renders with all props set 1`] = ` } - placement="bottomLeft" > title diff --git a/ui/src/literature/components/__tests__/__snapshots__/LiteratureItem.test.jsx.snap b/ui/src/literature/components/__tests__/__snapshots__/LiteratureItem.test.jsx.snap index 9e8dcd0b6b..f133401f33 100644 --- a/ui/src/literature/components/__tests__/__snapshots__/LiteratureItem.test.jsx.snap +++ b/ui/src/literature/components/__tests__/__snapshots__/LiteratureItem.test.jsx.snap @@ -17,15 +17,14 @@ exports[`LiteratureItem does not arxiv pdf download action if there is no eprint eventPropName="onClick" extractEventArgsToForward={null} > - } text="0 citations" - type="login" /> - + @@ -39,7 +38,6 @@ exports[`LiteratureItem does not arxiv pdf download action if there is no eprint > - } text="0 citations" - type="login" /> - + @@ -116,7 +113,6 @@ exports[`LiteratureItem renders 0 citations if it does not exist 1`] = ` > } iconText="pdf" - iconType="download" trackerEventId="PdfDownload" urls={ Immutable.List [ @@ -183,15 +179,14 @@ exports[`LiteratureItem renders with all props set, including sub props 1`] = ` eventPropName="onClick" extractEventArgsToForward={null} > - } text="1 citation" - type="login" /> - + @@ -205,7 +200,6 @@ exports[`LiteratureItem renders with all props set, including sub props 1`] = ` > } title={ - - + } /> diff --git a/ui/src/literature/components/__tests__/__snapshots__/UrlsAction.test.jsx.snap b/ui/src/literature/components/__tests__/__snapshots__/UrlsAction.test.jsx.snap index cc2810b1c7..682b7f08ff 100644 --- a/ui/src/literature/components/__tests__/__snapshots__/UrlsAction.test.jsx.snap +++ b/ui/src/literature/components/__tests__/__snapshots__/UrlsAction.test.jsx.snap @@ -12,8 +12,8 @@ exports[`UrlsAction renders multiple, with and without description 1`] = ` loading={false} > } + text="download" /> } @@ -63,8 +63,8 @@ exports[`UrlsAction renders single 1`] = ` href="https://www.whatever.com/pdfs/fulltext.pdf" > } text="pdf" - type="download" /> diff --git a/ui/src/literature/containers/DetailPageContainer/DetailPageContainer.jsx b/ui/src/literature/containers/DetailPageContainer/DetailPageContainer.jsx index 2bd595ea76..2c4372e1cc 100644 --- a/ui/src/literature/containers/DetailPageContainer/DetailPageContainer.jsx +++ b/ui/src/literature/containers/DetailPageContainer/DetailPageContainer.jsx @@ -4,6 +4,7 @@ import { connect } from 'react-redux'; import { Row, Col, Tabs } from 'antd'; import { Map, List } from 'immutable'; import classNames from 'classnames'; +import { DownloadOutlined, LinkOutlined } from '@ant-design/icons'; import './DetailPage.scss'; import { @@ -108,7 +109,7 @@ function DetailPage({ } trackerEventId="PdfDownload" /> )} @@ -116,7 +117,7 @@ function DetailPage({ } trackerEventId="LiteratureFileLink" /> )} diff --git a/ui/src/setupTests.js b/ui/src/setupTests.js index d8977c77fd..5b2248d1cb 100644 --- a/ui/src/setupTests.js +++ b/ui/src/setupTests.js @@ -22,3 +22,15 @@ global.MutationObserver = class { global.document.getSelection = function() {}; global.CONFIG = {}; global.scrollTo = () => {}; + +// fix react-media +global.window.matchMedia = jest.fn().mockImplementation(query => ({ + matches: false, + media: query, + onchange: null, + addListener: jest.fn(), // deprecated + removeListener: jest.fn(), // deprecated + addEventListener: jest.fn(), + removeEventListener: jest.fn(), + dispatchEvent: jest.fn(), +})); diff --git a/ui/src/submissions/__tests__/__snapshots__/index.test.jsx.snap b/ui/src/submissions/__tests__/__snapshots__/index.test.jsx.snap index f5b5491f88..b15b499b58 100644 --- a/ui/src/submissions/__tests__/__snapshots__/index.test.jsx.snap +++ b/ui/src/submissions/__tests__/__snapshots__/index.test.jsx.snap @@ -12,7 +12,6 @@ exports[`Submissions renders initial state 1`] = ` +
{error && ( -
+ )} - + - + ); } } diff --git a/ui/src/submissions/authors/containers/AuthorSubmissionPageContainer.jsx b/ui/src/submissions/authors/containers/AuthorSubmissionPageContainer.jsx index b6882355d2..b2089a1938 100644 --- a/ui/src/submissions/authors/containers/AuthorSubmissionPageContainer.jsx +++ b/ui/src/submissions/authors/containers/AuthorSubmissionPageContainer.jsx @@ -32,16 +32,18 @@ class AuthorSubmissionPage extends Component { -

Suggest author

- This form allows you to create the profile of a new author. All - modifications are transferred to{' '} - - inspirehep.net/hepnames - {' '} - upon approval. + +

Suggest author

+ This form allows you to create the profile of a new author. All + modifications are transferred to{' '} + + inspirehep.net/hepnames + {' '} + upon approval. + - + Author with this ORCID already exist, please submit an - update - + `; diff --git a/ui/src/submissions/common/__tests__/__snapshots__/withFormItem.test.jsx.snap b/ui/src/submissions/common/__tests__/__snapshots__/withFormItem.test.jsx.snap index d7d3fadbc7..3af31ed469 100644 --- a/ui/src/submissions/common/__tests__/__snapshots__/withFormItem.test.jsx.snap +++ b/ui/src/submissions/common/__tests__/__snapshots__/withFormItem.test.jsx.snap @@ -65,7 +65,7 @@ exports[`withFormItem passes all props correctly to Form.Item and wrapped Input normalProp2="np2" /> Test Suffix @@ -128,7 +128,7 @@ exports[`withFormItem passes all props correctly to Form.Item and wrapped Input normalProp2="np2" /> Test Suffix @@ -186,7 +186,7 @@ exports[`withFormItem passes props correctly to Form.Item and wrapped Input comp exports[`withFormItem passes props correctly to Form.Item and wrapped Input component (without error and only child) 1`] = ` {label}} labelCol={labelCol} + wrapperCol={wrapperCol} > - + {items && items.length > 0 && items.map((item, index) => ( @@ -56,8 +53,7 @@ class ArrayOf extends Component { {renderItem(`${name}.${index}`)} {items.length > 1 && ( - remove(index)} /> @@ -66,19 +62,13 @@ class ArrayOf extends Component { ))} - + @@ -92,6 +82,7 @@ class ArrayOf extends Component { ArrayOf.propTypes = { label: PropTypes.string, labelCol: PropTypes.object, + wrapperCol: PropTypes.object, extractKey: PropTypes.func, renderItem: PropTypes.func.isRequired, // func(itemName) emptyItem: PropTypes.oneOfType([PropTypes.object, PropTypes.string]), @@ -102,6 +93,7 @@ ArrayOf.defaultProps = { label: null, emptyItem: null, labelCol: LABEL_COL, + wrapperCol: WRAPPER_COL, }; export default ArrayOf; diff --git a/ui/src/submissions/common/components/DateRangeField.jsx b/ui/src/submissions/common/components/DateRangeField.jsx index 51ebadfff6..7ad53ea575 100644 --- a/ui/src/submissions/common/components/DateRangeField.jsx +++ b/ui/src/submissions/common/components/DateRangeField.jsx @@ -4,6 +4,8 @@ import moment from 'moment'; import withFormItem from '../withFormItem'; +const BOTH_TRUE = [true, true]; + function DateRangeField({ value = [], ...props }) { const { form, name } = props; @@ -28,15 +30,16 @@ function DateRangeField({ value = [], ...props }) { ); return ( -
- -
+ ); } diff --git a/ui/src/submissions/common/components/SuggesterField.jsx b/ui/src/submissions/common/components/SuggesterField.jsx index 31f6414824..b9ba92afd7 100644 --- a/ui/src/submissions/common/components/SuggesterField.jsx +++ b/ui/src/submissions/common/components/SuggesterField.jsx @@ -30,8 +30,8 @@ class SuggesterField extends Component { this.hasChangedBySuggestionSelection = false; } - onSelect(_, selectedOptionComponent) { - const selectedRecordData = selectedOptionComponent.props.result._source; + onSelect(_, selectedOption) { + const selectedRecordData = selectedOption.result._source; const { form, recordFieldPath, pidType } = this.props; // TODO: only send control_number to backend, and create the $ref url there. const $ref = `${window.location.origin}/api/${pidType}/${ @@ -46,6 +46,7 @@ class SuggesterField extends Component { return ( - {suffixText && {suffixText}} + {suffixText && {suffixText}} ); } diff --git a/ui/src/submissions/conferences/components/ConferenceSubmission.jsx b/ui/src/submissions/conferences/components/ConferenceSubmission.jsx index 9d0ff1f528..d332fc9fa9 100644 --- a/ui/src/submissions/conferences/components/ConferenceSubmission.jsx +++ b/ui/src/submissions/conferences/components/ConferenceSubmission.jsx @@ -26,16 +26,16 @@ function ConferenceSubmission({ onSubmit, error = null }) { [onSubmit, isMounted] ); return ( - +
{error && ( -
+ )} - + - + ); } diff --git a/ui/src/submissions/conferences/containers/ConferenceSubmissionPageContainer.jsx b/ui/src/submissions/conferences/containers/ConferenceSubmissionPageContainer.jsx index 6c1efd87ee..8d99a642bf 100644 --- a/ui/src/submissions/conferences/containers/ConferenceSubmissionPageContainer.jsx +++ b/ui/src/submissions/conferences/containers/ConferenceSubmissionPageContainer.jsx @@ -15,15 +15,18 @@ function ConferenceSubmissionPage({ error, onSubmit }) { -

Submit a new conference

- This form allows you to submit a new conference to INSPIRE. It will - appear in the - Conference List - {' '} - immediately. + +

Submit a new conference

+ This form allows you to submit a new conference to INSPIRE. It will + appear in the + {' '} + Conference List + {' '} + immediately. + - + diff --git a/ui/src/submissions/conferences/containers/__tests__/__snapshots__/ConferenceSubmissionSuccessPageContainer.test.jsx.snap b/ui/src/submissions/conferences/containers/__tests__/__snapshots__/ConferenceSubmissionSuccessPageContainer.test.jsx.snap index 37b4a0e844..840e26241a 100644 --- a/ui/src/submissions/conferences/containers/__tests__/__snapshots__/ConferenceSubmissionSuccessPageContainer.test.jsx.snap +++ b/ui/src/submissions/conferences/containers/__tests__/__snapshots__/ConferenceSubmissionSuccessPageContainer.test.jsx.snap @@ -8,12 +8,11 @@ exports[`ConferenceSubmissionSuccessPageContainer ConferenceSubmissionSucessPage C19-02-01 ) - here - + . } diff --git a/ui/src/submissions/conferences/schemas/__tests__/conference.test.js b/ui/src/submissions/conferences/schemas/__tests__/conference.test.js index 5257b119f2..f1039dd481 100644 --- a/ui/src/submissions/conferences/schemas/__tests__/conference.test.js +++ b/ui/src/submissions/conferences/schemas/__tests__/conference.test.js @@ -75,6 +75,15 @@ describe('conferenceSchema', () => { expect(isValid).toBe(false); }); + it('invalidates when only one of the dates is present', async () => { + const data = { + ...dataWithRequiredFields, + dates: ['2020-06-01', ''], + }; + const isValid = await conferenceSchema.isValid(data); + expect(isValid).toBe(false); + }); + it('invalidates when dates have only single date', async () => { const data = { ...dataWithRequiredFields, diff --git a/ui/src/submissions/conferences/schemas/conference.js b/ui/src/submissions/conferences/schemas/conference.js index 5d44c57570..8a7c4afdc4 100644 --- a/ui/src/submissions/conferences/schemas/conference.js +++ b/ui/src/submissions/conferences/schemas/conference.js @@ -17,6 +17,7 @@ const conferenceSchema = object().shape({ series_number: number().label('Series Number'), dates: array() .of(date()) + .compact() .min(2) .max(2) .required() diff --git a/ui/src/submissions/jobs/components/JobSubmission.jsx b/ui/src/submissions/jobs/components/JobSubmission.jsx index 78d371b6ae..4641a7d091 100644 --- a/ui/src/submissions/jobs/components/JobSubmission.jsx +++ b/ui/src/submissions/jobs/components/JobSubmission.jsx @@ -43,16 +43,16 @@ class JobSubmission extends Component { ...initialFormData, }; return ( - +
{error && ( -
+ )} - + - + ); } } diff --git a/ui/src/submissions/jobs/components/__tests__/__snapshots__/JobUpdateSubmissionSuccessPage.test.jsx.snap b/ui/src/submissions/jobs/components/__tests__/__snapshots__/JobUpdateSubmissionSuccessPage.test.jsx.snap index 9e68a84d5b..76666cb3e5 100644 --- a/ui/src/submissions/jobs/components/__tests__/__snapshots__/JobUpdateSubmissionSuccessPage.test.jsx.snap +++ b/ui/src/submissions/jobs/components/__tests__/__snapshots__/JobUpdateSubmissionSuccessPage.test.jsx.snap @@ -5,12 +5,11 @@ exports[`JobUpdateSubmissionSuccessPage renders 1`] = ` message={ Successfully submitted, thank you for the submission! See the updates - here - + . } diff --git a/ui/src/submissions/jobs/containers/JobSubmissionPageContainer.jsx b/ui/src/submissions/jobs/containers/JobSubmissionPageContainer.jsx index dbf892e191..63c3040b5e 100644 --- a/ui/src/submissions/jobs/containers/JobSubmissionPageContainer.jsx +++ b/ui/src/submissions/jobs/containers/JobSubmissionPageContainer.jsx @@ -27,12 +27,15 @@ class JobSubmissionPage extends Component { -

Submit a new job opening

- This form allows you to advertise a new job opening. It will appear - in the Jobs List upon approval. + +

Submit a new job opening

+ This form allows you to advertise a new job opening. It will + appear in the Jobs List upon + approval. + - + diff --git a/ui/src/submissions/jobs/containers/JobUpdateSubmissionPageContainer.jsx b/ui/src/submissions/jobs/containers/JobUpdateSubmissionPageContainer.jsx index 55ba4d92ed..0e1da33301 100644 --- a/ui/src/submissions/jobs/containers/JobUpdateSubmissionPageContainer.jsx +++ b/ui/src/submissions/jobs/containers/JobUpdateSubmissionPageContainer.jsx @@ -59,7 +59,7 @@ class JobUpdateSubmissionPage extends Component { - +

Update a job opening

All modifications will appear immediately. diff --git a/ui/src/submissions/literature/components/DataImporter.jsx b/ui/src/submissions/literature/components/DataImporter.jsx index 132a59802d..94166adc1c 100644 --- a/ui/src/submissions/literature/components/DataImporter.jsx +++ b/ui/src/submissions/literature/components/DataImporter.jsx @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { Map } from 'immutable'; -import { Input, Button, Alert, Row, Col, Form, Tooltip } from 'antd'; +import { Input, Button, Alert, Row, Col, Tooltip, Form } from 'antd'; import ExternalLink from '../../../common/components/ExternalLink'; import LinkLikeButton from '../../../common/components/LinkLikeButton'; @@ -49,7 +49,7 @@ class DataImporter extends Component { return (
-
+ +
{error && ( -
+ )} - + - + ); } diff --git a/ui/src/submissions/literature/components/__tests__/__snapshots__/DataImporter.test.jsx.snap b/ui/src/submissions/literature/components/__tests__/__snapshots__/DataImporter.test.jsx.snap index 023b308e1a..b21c18c092 100644 --- a/ui/src/submissions/literature/components/__tests__/__snapshots__/DataImporter.test.jsx.snap +++ b/ui/src/submissions/literature/components/__tests__/__snapshots__/DataImporter.test.jsx.snap @@ -6,7 +6,9 @@ exports[`DataImporter renders with error with a message 1`] = ` className="mb3" gutter={0} > - + - + - + - + - + {shouldDisplayForm && ( <> - + @@ -94,7 +94,7 @@ function LiteratureSubmissionPage({ error, importedFormData, onSubmit }) { - + =1.0.1" - dom-converter@~0.2: version "0.2.0" resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" dependencies: utila "~0.4" -dom-matches@>=1.0.1: - version "2.0.0" - resolved "https://registry.yarnpkg.com/dom-matches/-/dom-matches-2.0.0.tgz#d2728b416a87533980eb089b848d253cf23a758c" - integrity sha1-0nKLQWqHUzmA6wibhI0lPPI6dYw= - -dom-scroll-into-view@1.x, dom-scroll-into-view@^1.2.0, dom-scroll-into-view@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/dom-scroll-into-view/-/dom-scroll-into-view-1.2.1.tgz#e8f36732dd089b0201a88d7815dc3f88e6d66c7e" - integrity sha1-6PNnMt0ImwIBqI14Fdw/iObWbH4= - dom-serializer@0, dom-serializer@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82" @@ -3317,15 +3294,6 @@ dotenv@6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.0.0.tgz#24e37c041741c5f4b25324958ebbc34bca965935" -draft-js@^0.10.0, draft-js@~0.10.0: - version "0.10.5" - resolved "https://registry.yarnpkg.com/draft-js/-/draft-js-0.10.5.tgz#bfa9beb018fe0533dbb08d6675c371a6b08fa742" - integrity sha512-LE6jSCV9nkPhfVX2ggcRLA4FKs6zWq9ceuO/88BpXdNCS7mjRTgs0NsV6piUCJX9YxMsB9An33wnkMmU2sD2Zg== - dependencies: - fbjs "^0.8.15" - immutable "~3.7.4" - object-assign "^4.1.0" - duplexer@^0.1.1: version "0.1.1" resolved "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" @@ -3409,11 +3377,6 @@ enhanced-resolve@^4.1.0: memory-fs "^0.4.0" tapable "^1.0.0" -enquire.js@^2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/enquire.js/-/enquire.js-2.1.6.tgz#3e8780c9b8b835084c3f60e166dbc3c2a3c89814" - integrity sha1-PoeAybi4NQhMP2DhZtvDwqPImBQ= - entities@^1.1.1, entities@~1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" @@ -3787,11 +3750,6 @@ eventemitter3@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163" -eventlistener@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/eventlistener/-/eventlistener-0.0.1.tgz#ed2baabb852227af2bcf889152c72c63ca532eb8" - integrity sha1-7Suqu4UiJ68rz4iRUscsY8pTLrg= - events@^1.0.0: version "1.1.1" resolved "http://registry.npmjs.org/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" @@ -4020,7 +3978,7 @@ fb-watchman@^2.0.0: dependencies: bser "^2.0.0" -fbjs@^0.8.0, fbjs@^0.8.15, fbjs@^0.8.16, fbjs@^0.8.9: +fbjs@^0.8.9: version "0.8.17" resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd" integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90= @@ -4726,6 +4684,18 @@ history@^4.7.2: value-equal "^0.4.0" warning "^3.0.0" +history@^4.9.0: + version "4.10.1" + resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3" + integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew== + dependencies: + "@babel/runtime" "^7.1.2" + loose-envify "^1.2.0" + resolve-pathname "^3.0.0" + tiny-invariant "^1.0.2" + tiny-warning "^1.0.0" + value-equal "^1.0.1" + hmac-drbg@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -4738,10 +4708,17 @@ hoek@4.2.1, hoek@4.x.x: version "4.2.1" resolved "http://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb" -hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0: +hoist-non-react-statics@^2.3.1: version "2.5.5" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47" +hoist-non-react-statics@^3.1.0: + version "3.3.2" + resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" + integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== + dependencies: + react-is "^16.7.0" + hoist-non-react-statics@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b" @@ -4959,15 +4936,10 @@ immer@1.7.2: version "1.7.2" resolved "https://registry.yarnpkg.com/immer/-/immer-1.7.2.tgz#a51e9723c50b27e132f6566facbec1c85fc69547" -immutable@^3.7.4, immutable@^3.8.1, immutable@^3.8.2: +immutable@^3.8.1, immutable@^3.8.2: version "3.8.2" resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3" -immutable@~3.7.4: - version "3.7.6" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.7.6.tgz#13b4d3cb12befa15482a26fe1b2ebae640071e4b" - integrity sha1-E7TTyxK++hVIKib+Gy665kAHHks= - import-cwd@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9" @@ -5060,6 +5032,11 @@ inquirer@6.2.0, inquirer@^6.1.0: strip-ansi "^4.0.0" through "^2.3.6" +insert-css@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/insert-css/-/insert-css-2.0.0.tgz#eb5d1097b7542f4c79ea3060d3aee07d053880f4" + integrity sha1-610Ql7dUL0x56jBg067gfQU4gPQ= + internal-ip@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz#df5c99876e1d2eb2ea2d74f520e3f669a00ece27" @@ -5423,11 +5400,6 @@ isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" -ismobilejs@^0.5.1: - version "0.5.2" - resolved "https://registry.yarnpkg.com/ismobilejs/-/ismobilejs-0.5.2.tgz#e81bacf6187c532ad8348355f4fecd6e6adfdce1" - integrity sha512-ta9UdV60xVZk/ZafFtSFslQaE76SvNkcs1r73d2PVR21zVzx9xuYv9tNe4MxA1NN7WoeCc2RjGot3Bz1eHDx3Q== - isobject@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" @@ -6226,7 +6198,7 @@ lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" -lodash.debounce@^4.0.0, lodash.debounce@^4.0.8: +lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" @@ -6325,11 +6297,6 @@ lodash.templatesettings@^4.0.0: dependencies: lodash._reinterpolate "~3.0.0" -lodash.throttle@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4" - integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ= - lodash.transform@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.transform/-/lodash.transform-4.6.0.tgz#12306422f63324aed8483d3f38332b5f670547a0" @@ -6342,12 +6309,12 @@ lodash.uniq@^4.5.0: version "4.17.11" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" -lodash@^4.16.5, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5: +lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5: version "4.17.14" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba" integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw== -lodash@^4.17.14, lodash@^4.17.15: +lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== @@ -6586,6 +6553,15 @@ min-document@^2.19.0: dependencies: dom-walk "^0.1.0" +mini-create-react-context@^0.3.0: + version "0.3.2" + resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.3.2.tgz#79fc598f283dd623da8e088b05db8cddab250189" + integrity sha512-2v+OeetEyliMt5VHMXsBhABoJ0/M4RCe7fatd/fBy6SMiKazUSEt3gxxypfnk2SHMkdBYvorHRoQxuGoiwbzAw== + dependencies: + "@babel/runtime" "^7.4.0" + gud "^1.0.0" + tiny-warning "^1.0.2" + mini-css-extract-plugin@0.4.3: version "0.4.3" resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.3.tgz#98d60fcc5d228c3e36a9bd15a1d6816d6580beb8" @@ -6689,7 +6665,7 @@ mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdi dependencies: minimist "0.0.8" -moment@2.x, moment@^2.24.0: +moment@^2.24.0: version "2.24.0" resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" @@ -6727,11 +6703,6 @@ multicast-dns@^6.0.1: dns-packet "^1.3.1" thunky "^1.0.2" -mutationobserver-shim@^0.3.2: - version "0.3.3" - resolved "https://registry.yarnpkg.com/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz#65869630bc89d7bf8c9cd9cb82188cd955aacd2b" - integrity sha512-gciOLNN8Vsf7YzcqRjKzlAJ6y7e+B86u7i3KXes0xfxx/nfLmozlW1Vn+Sc9x3tPIePFgc1AeIFhtRgkqTjzDQ== - mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" @@ -8194,13 +8165,6 @@ prop-types@15.7.2, prop-types@15.x, prop-types@^15.5.0, prop-types@^15.5.10, pro object-assign "^4.1.1" react-is "^16.8.1" -prop-types@^15.6.1: - version "15.6.2" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102" - dependencies: - loose-envify "^1.3.1" - object-assign "^4.1.1" - property-expr@^1.5.0: version "1.5.1" resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-1.5.1.tgz#22e8706894a0c8e28d58735804f6ba3a3673314f" @@ -8376,17 +8340,17 @@ raw-body@2.3.3: iconv-lite "0.4.23" unpipe "1.0.0" -rc-align@^2.4.0, rc-align@^2.4.1: - version "2.4.5" - resolved "https://registry.yarnpkg.com/rc-align/-/rc-align-2.4.5.tgz#c941a586f59d1017f23a428f0b468663fb7102ab" - integrity sha512-nv9wYUYdfyfK+qskThf4BQUSIadeI/dCsfaMZfNEoxm9HwOIioQ+LyqmMK6jWHAZQgOzMLaqawhuBXlF63vgjw== +rc-align@^3.0.0-rc.0: + version "3.0.0-rc.1" + resolved "https://registry.yarnpkg.com/rc-align/-/rc-align-3.0.0-rc.1.tgz#32d1fac860d12bb85e9b8cafbbdef79f3f537674" + integrity sha512-GbofumhCUb7SxP410j/fbtR2M9Zml+eoZSdaliZh6R3NhfEj5zP4jcO3HG3S9C9KIcXQQtd/cwVHkb9Y0KU7Hg== dependencies: - babel-runtime "^6.26.0" + classnames "2.x" dom-align "^1.7.0" - prop-types "^15.5.8" - rc-util "^4.0.4" + rc-util "^4.12.0" + resize-observer-polyfill "^1.5.1" -rc-animate@2.x, rc-animate@^2.3.0, rc-animate@^2.6.0, rc-animate@^2.8.2, rc-animate@^2.8.3: +rc-animate@2.x: version "2.9.2" resolved "https://registry.yarnpkg.com/rc-animate/-/rc-animate-2.9.2.tgz#5964767805c886f1bdc7563d3935a74912a0b78f" integrity sha512-rkJjeJgfbDqVjVX1/QTRfS7PiCq3AnmeYo840cVcuC4pXq4k4yAQMsC2v5BPXXdawC04vnyO4/qHQdbx9ANaiw== @@ -8399,44 +8363,27 @@ rc-animate@2.x, rc-animate@^2.3.0, rc-animate@^2.6.0, rc-animate@^2.8.2, rc-anim rc-util "^4.8.0" react-lifecycles-compat "^3.0.4" -rc-animate@^3.0.0-rc.1: - version "3.0.0-rc.6" - resolved "https://registry.yarnpkg.com/rc-animate/-/rc-animate-3.0.0-rc.6.tgz#04288eefa118e0cae214536c8a903ffaac1bc3fb" - integrity sha512-oBLPpiT6Q4t6YvD/pkLcmofBP1p01TX0Otse8Q4+Mxt8J+VSDflLZGIgf62EwkvRwsQUkLPjZVFBsldnPKLzjg== +rc-animate@^2.10.0, rc-animate@^2.10.1, rc-animate@^2.10.2, rc-animate@^2.9.2, rc-animate@~2.10.2: + version "2.10.3" + resolved "https://registry.yarnpkg.com/rc-animate/-/rc-animate-2.10.3.tgz#163d5e29281a4ff82d53ee7918eeeac856b756f9" + integrity sha512-A9qQ5Y8BLlM7EhuCO3fWb/dChndlbWtY/P5QvPqBU7h4r5Q2QsvsbpTGgdYZATRDZbTRnJXXfVk9UtlyS7MBLg== dependencies: babel-runtime "6.x" - classnames "^2.2.5" - component-classes "^1.2.6" - fbjs "^0.8.16" + classnames "^2.2.6" + css-animation "^1.3.2" prop-types "15.x" raf "^3.4.0" - rc-util "^4.5.0" - react-lifecycles-compat "^3.0.4" - -rc-calendar@~9.15.0: - version "9.15.4" - resolved "https://registry.yarnpkg.com/rc-calendar/-/rc-calendar-9.15.4.tgz#b8fe1d6b1f9c3963521f4d17c06b43720f052168" - integrity sha512-+3gS00OO6OfNL7R9vI/YOY86oZ1NKRiK74CzVinJ6qm1PhQobr8IfSdli3cdj6vib9i1MKVn7xRSgUpgJ0rKhA== - dependencies: - babel-runtime "6.x" - classnames "2.x" - moment "2.x" - prop-types "^15.5.8" - rc-trigger "^2.2.0" - rc-util "^4.1.1" + rc-util "^4.15.3" react-lifecycles-compat "^3.0.4" -rc-cascader@~0.17.4: - version "0.17.4" - resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-0.17.4.tgz#bb38ba3ed0990bfaa5ee547467d85ecc0d152f96" - integrity sha512-CeFQJIMzY7x++uPqlx4Xl/cH8iTs8nRoW522+DLb21kdL5kWqKlK+3iHXExoxcAymjwo5ScIiXi+NY4m8Pgq9w== +rc-cascader@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-1.0.1.tgz#770de1e1fa7bd559aabd4d59e525819b8bc809b7" + integrity sha512-3mk33+YKJBP1XSrTYbdVLuCC73rUDq5STNALhvua5i8vyIgIxtb5fSl96JdWWq1Oj8tIBoHnCgoEoOYnIXkthQ== dependencies: array-tree-filter "^2.1.0" - prop-types "^15.5.8" - rc-trigger "^2.2.0" + rc-trigger "^4.0.0" rc-util "^4.0.4" - react-lifecycles-compat "^3.0.4" - shallow-equal "^1.0.0" warning "^4.0.1" rc-checkbox@~2.1.6: @@ -8461,74 +8408,41 @@ rc-collapse@~1.11.3: react-is "^16.7.0" shallowequal "^1.1.0" -rc-dialog@~7.4.0: - version "7.4.1" - resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-7.4.1.tgz#2bb4dee930bbed404b032710fff07732db09ebdd" - integrity sha512-vvVVP7AUjxs2AEGL5GUr6BjfVzaiBV5RoiPYchCDqHmf8n7xTrfsACAhZ2Vezj6mtl2446zhxoGvhxNpyCyX7A== +rc-dialog@~7.6.0: + version "7.6.0" + resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-7.6.0.tgz#6467b75f5b60038129bf2e1b003b264281949c09" + integrity sha512-N48vBPW8I53WycFHI4KXhuTUkB4mx+hixq1a9tcFMLoE7EhkAjbHvs0vGg+Bh/uFg5V00jmZBgQOIEbhcNal/A== dependencies: babel-runtime "6.x" rc-animate "2.x" - rc-util "^4.4.0" + rc-util "^4.16.1" -rc-drawer@~1.10.1: - version "1.10.1" - resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-1.10.1.tgz#9a74242cf37f5709f83483a987e15d68277afe44" - integrity sha512-2KufXkWK9N19eGYmUldIe6sYaC6IIVrts6v8WXnPuIoI9zVPGnwXnK/of+lQEBhidEPBBMBXnvTdGwvTpl60vQ== - dependencies: - babel-runtime "6.x" - classnames "^2.2.5" - prop-types "^15.5.0" - rc-util "^4.5.1" - -rc-dropdown@~2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/rc-dropdown/-/rc-dropdown-2.4.1.tgz#aaef6eb3a5152cdd9982895c2a78d9b5f046cdec" - integrity sha512-p0XYn0wrOpAZ2fUGE6YJ6U8JBNc5ASijznZ6dkojdaEfQJAeZtV9KMEewhxkVlxGSbbdXe10ptjBlTEW9vEwEg== +rc-drawer@~3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-3.1.3.tgz#cbcb04d4c07f0b66f2ece11d847f4a1bd80ea0b7" + integrity sha512-2z+RdxmzXyZde/1OhVMfDR1e/GBswFeWSZ7FS3Fdd0qhgVdpV1wSzILzzxRaT481ItB5hOV+e8pZT07vdJE8kg== dependencies: - babel-runtime "^6.26.0" classnames "^2.2.6" - prop-types "^15.5.8" - rc-trigger "^2.5.1" - react-lifecycles-compat "^3.0.2" + rc-util "^4.16.1" + react-lifecycles-compat "^3.0.4" -rc-editor-core@~0.8.3: - version "0.8.10" - resolved "https://registry.yarnpkg.com/rc-editor-core/-/rc-editor-core-0.8.10.tgz#6f215bc5df9c33ffa9f6c5b30ca73a7dabe8ab7c" - integrity sha512-T3aHpeMCIYA1sdAI7ynHHjXy5fqp83uPlD68ovZ0oClTSc3tbHmyCxXlA+Ti4YgmcpCYv7avF6a+TIbAka53kw== +rc-dropdown@~3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/rc-dropdown/-/rc-dropdown-3.0.1.tgz#0c05318c4d3e6bb5f5d2446444c9b084da3d0d90" + integrity sha512-TbfTvJwFAaP1vPX/A/uxS07vbn2OqbHak9KJIL6Tdb0sV+sFXaIRo0udJixljkplbgPkLiasy8Xqnk1MGMfa0Q== dependencies: babel-runtime "^6.26.0" - classnames "^2.2.5" - draft-js "^0.10.0" - immutable "^3.7.4" - lodash "^4.16.5" - prop-types "^15.5.8" - setimmediate "^1.0.5" - -rc-editor-mention@^1.1.13: - version "1.1.13" - resolved "https://registry.yarnpkg.com/rc-editor-mention/-/rc-editor-mention-1.1.13.tgz#9f1cab1065f86b01523840321790c2ab12ac5e8b" - integrity sha512-3AOmGir91Fi2ogfRRaXLtqlNuIwQpvla7oUnGHS1+3eo7b+fUp5IlKcagqtwUBB5oDNofoySXkLBxzWvSYNp/Q== - dependencies: - babel-runtime "^6.23.0" - classnames "^2.2.5" - dom-scroll-into-view "^1.2.0" - draft-js "~0.10.0" - immutable "~3.7.4" - prop-types "^15.5.8" - rc-animate "^2.3.0" - rc-editor-core "~0.8.3" + classnames "^2.2.6" + rc-trigger "^4.0.0" -rc-form@^2.4.5: - version "2.4.8" - resolved "https://registry.yarnpkg.com/rc-form/-/rc-form-2.4.8.tgz#79a1f124d4fa81dff2af2992e94aa3e58cad683c" - integrity sha512-hlHajcYg51pFQf+B6neAbhy2ZA+8DmxnDxiOYZRAXCLhPN788ZnrtZq5/iADDWcZqjHFnXiThoZE/Fu8syciDQ== +rc-field-form@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-1.0.0.tgz#3293d6ae6dd4c4b0f1e7b2857ca8e15c61272dde" + integrity sha512-yPgmQjE8aRGwkTl2UsG18UBghekqux9SFfjxWHd80MugGeLpmCJwtwK98bxWhhVELu1YhZtrQQ5EHiNEWptYZg== dependencies: - async-validator "~1.11.3" - babel-runtime "6.x" - create-react-class "^15.5.3" - dom-scroll-into-view "1.x" - hoist-non-react-statics "^3.3.0" - lodash "^4.17.4" + "@babel/runtime" "^7.8.4" + async-validator "^3.0.3" + rc-util "^4.17.0" warning "^4.0.3" rc-hammerjs@~0.6.0: @@ -8540,10 +8454,10 @@ rc-hammerjs@~0.6.0: hammerjs "^2.0.8" prop-types "^15.5.9" -rc-input-number@~4.4.5: - version "4.4.5" - resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-4.4.5.tgz#81473d2885a6b312e486c4f2ba3f441c1ab88520" - integrity sha512-Dt20e8Ylc/N/6oXiPUlwDVdx3fz7W5umUOa4z5pBuWFG7NPlBVXRWkq7+nbnTyaK24UxN67PVpmD3+Omo+QRZQ== +rc-input-number@~4.5.4: + version "4.5.6" + resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-4.5.6.tgz#0d52762b0ac39432256e2c6c5c836102f9797c46" + integrity sha512-AXbL4gtQ1mSQnu6v/JtMv3UbGRCzLvQznmf0a7U/SAtZ8+dCEAqD4JpJhkjv73Wog53eRYhw4l7ApdXflc9ymg== dependencies: babel-runtime "6.x" classnames "^2.2.0" @@ -8551,56 +8465,56 @@ rc-input-number@~4.4.5: rc-util "^4.5.1" rmc-feedback "^2.0.0" -rc-mentions@~0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/rc-mentions/-/rc-mentions-0.3.1.tgz#7c54f8fbd2e203c56ff4e0a0191ce4a2c9a88c86" - integrity sha512-fa5dN3IMTahJfAga1nmma9OymK/ZBV/MZfV11h4kjDmCAVETv5EbAlV0mn6Y+JajvXS6n/XFoPUSF+nwK/AeWw== +rc-mentions@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/rc-mentions/-/rc-mentions-1.0.1.tgz#4a82b5011ccd3f0008f69f3b2e29ab8c0d91b17f" + integrity sha512-EgXFYsNHk44ifwDcbtd3zX7rJc3lHplfVEVEf8oxZeeyyIzFD0GLs0Z0LWHNs6Gm4wTAHvcR0j4Pd5M7fLtBoA== dependencies: - "@ant-design/create-react-context" "^0.2.4" - babel-runtime "^6.23.0" classnames "^2.2.6" - rc-menu "^7.4.22" - rc-trigger "^2.6.2" + rc-menu "^8.0.1" + rc-trigger "^4.0.0" rc-util "^4.6.0" - react-lifecycles-compat "^3.0.4" -rc-menu@^7.3.0, rc-menu@^7.4.22, rc-menu@~7.4.23: - version "7.4.23" - resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-7.4.23.tgz#e07d497864274076299d7d8a84d14fc86b6bd30d" - integrity sha512-d0pUMN0Zr3GCFxNpas8p7AUTeX8viItUOQXku4AsyX82ZzUz79HgGul2Nk17BIFTtLzqdB7/NT6WVb5PAOOILw== +rc-menu@^8.0.1, rc-menu@~8.0.1: + version "8.0.2" + resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-8.0.2.tgz#ce8dacad615c4cadb47c018be3a0791248b04d14" + integrity sha512-0zae6+LVQf+XTBepSMwwn2Wu+CvRf0eAVh62xl0UcjFBvyA0uGz+dAE0SVR6oUA0q9X+/G14CV1ItZFdwaP6/g== dependencies: - babel-runtime "6.x" classnames "2.x" - dom-scroll-into-view "1.x" - ismobilejs "^0.5.1" mini-store "^2.0.0" - mutationobserver-shim "^0.3.2" - prop-types "^15.5.6" - rc-animate "2.x" - rc-trigger "^2.3.0" - rc-util "^4.1.0" + rc-animate "^2.10.1" + rc-trigger "^4.0.0" + rc-util "^4.13.0" resize-observer-polyfill "^1.5.0" + scroll-into-view-if-needed "^2.2.20" + shallowequal "^1.1.0" -rc-notification@~3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/rc-notification/-/rc-notification-3.3.1.tgz#0baa3e70f8d40ab015ce8fa78c260c490fc7beb4" - integrity sha512-U5+f4BmBVfMSf3OHSLyRagsJ74yKwlrQAtbbL5ijoA0F2C60BufwnOcHG18tVprd7iaIjzZt1TKMmQSYSvgrig== +rc-notification@~4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/rc-notification/-/rc-notification-4.0.0.tgz#ffe59783d6738003972dde8b9658f1acd469cd2c" + integrity sha512-In9FimkJY+JSIq3/eopPfBpQQr2Zugq5i9Aw9vdiNCGCsAsSO9bGq2dPsn8bamOydNrhc3djljGfmxUUMbcZnA== dependencies: - babel-runtime "6.x" classnames "2.x" - prop-types "^15.5.8" rc-animate "2.x" rc-util "^4.0.4" -rc-pagination@~1.20.1: - version "1.20.1" - resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-1.20.1.tgz#d53a0564282a79129588fbd2b74885d7d315f0bb" - integrity sha512-EC2sxfKo1+R34fDN8EQgFiJn0Z6SKef4O0FizoqV3IomPczSikoarxL1RrHzqeGNsfg7JbUYaux5fQdmUAlPnA== +rc-pagination@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-2.0.1.tgz#40deddb43173d951e2449c7d3f9951890f477ba1" + integrity sha512-jvLb05p1OEBUxRobWFjnrj6vRyvhG8XHouK6qh+eepCHPo7HDzUHHztvUUAWr5f+WnKldAXqdPcGgbM4rCH1OA== dependencies: - babel-runtime "6.x" - classnames "^2.2.6" - prop-types "^15.5.7" - react-lifecycles-compat "^3.0.4" + classnames "^2.2.1" + +rc-picker@~1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-1.1.2.tgz#9b4b552eac779b3568498c69453b6fb4aa796d3b" + integrity sha512-B4z1cqla4bZlVUcMuyeFmyPPx9eumpYd06gYFzLKsl5Yz3h1jTmW40hW1uxxUgPkeg6ym1X5TjUoB3ZOveHuMQ== + dependencies: + classnames "^2.2.1" + dayjs "^1.8.18" + moment "^2.24.0" + rc-trigger "^4.0.0" + rc-util "^4.17.0" rc-progress@~2.5.0: version "2.5.1" @@ -8610,51 +8524,54 @@ rc-progress@~2.5.0: babel-runtime "6.x" prop-types "^15.5.8" -rc-rate@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/rc-rate/-/rc-rate-2.5.0.tgz#72d4984a03d0a7a0e6779c7a79efcea27626abf6" - integrity sha512-aXX5klRqbVZxvLghcKnLqqo7LvLVCHswEDteWsm5Gb7NBIPa1YKTcAbvb5SZ4Z4i4EeRoZaPwygRAWsQgGtbKw== +rc-rate@~2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/rc-rate/-/rc-rate-2.5.1.tgz#55fc5fd23ea9dcc72250b9a889803479f4842961" + integrity sha512-3iJkNJT8xlHklPCdeZtUZmJmRVUbr6AHRlfSsztfYTXVlHrv2TcPn3XkHsH+12j812WVB7gvilS2j3+ffjUHXg== dependencies: classnames "^2.2.5" prop-types "^15.5.8" rc-util "^4.3.0" react-lifecycles-compat "^3.0.4" -rc-select@~9.1.4: - version "9.1.5" - resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-9.1.5.tgz#6811dd5f984e876cd6baa4767aaf6c152a4a1004" - integrity sha512-P2QDl5xSdrYuvODnwZIKxhBv2AzfsuFNfaoXjRsPTlQvOjLMCGYgyRzZ4xdUy1IAc1yER6LV+g7e4N9Qc+3DDQ== +rc-resize-observer@^0.1.0, rc-resize-observer@^0.1.2: + version "0.1.3" + resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-0.1.3.tgz#097191f9c3ab186ed907b553ba6ef565df11c249" + integrity sha512-uzOQEwx83xdQSFOkOAM7x7GHIQKYnrDV4dWxtCxyG1BS1pkfJ4EvDeMfsvAJHSYkQXVBu+sgRHGbRtLG3qiuUg== + dependencies: + classnames "^2.2.1" + rc-util "^4.13.0" + resize-observer-polyfill "^1.5.1" + +rc-select@^10.0.0, rc-select@~10.0.0: + version "10.0.1" + resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-10.0.1.tgz#5a41641347bdf2e200dc9c248222c0191ff08b48" + integrity sha512-DrBXl0pvNwiRssgHqJTgS61NPYlbkgNI6MAqJfd9qzm3RPQEHjSLFEU2hwRRJG1pzo46Dg7J94b+XbzWMDYo9Q== dependencies: - babel-runtime "^6.23.0" classnames "2.x" - component-classes "1.x" - dom-scroll-into-view "1.x" - prop-types "^15.5.8" - raf "^3.4.0" - rc-animate "2.x" - rc-menu "^7.3.0" - rc-trigger "^2.5.4" - rc-util "^4.0.4" - react-lifecycles-compat "^3.0.2" - warning "^4.0.2" + rc-animate "^2.10.0" + rc-trigger "^4.0.0" + rc-util "^4.17.0" + rc-virtual-list "^1.0.0" + warning "^4.0.3" -rc-slider@~8.6.11: - version "8.6.13" - resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-8.6.13.tgz#88a8150c2dda6709f3f119135de11fba80af765b" - integrity sha512-fCUe8pPn8n9pq1ARX44nN2nzJoATtna4x/PdskUrxIvZXN8ja7HuceN/hq6kokZjo3FBD2B1yMZvZh6oi68l6Q== +rc-slider@~9.2.1: + version "9.2.2" + resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-9.2.2.tgz#852ed38abda337b98aed5ada2090538d98446cc2" + integrity sha512-WwdNHb/cvnQXMhp8cRhxOM0pGnVG4fPoaFE31yVkyJUAZiHq3siQgwzAeYl11fyszwhrEXkpGU7tEAfClh0AaQ== dependencies: babel-runtime "6.x" classnames "^2.2.5" prop-types "^15.5.4" - rc-tooltip "^3.7.0" + rc-tooltip "^4.0.0" rc-util "^4.0.4" - shallowequal "^1.0.1" + shallowequal "^1.1.0" warning "^4.0.3" -rc-steps@~3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/rc-steps/-/rc-steps-3.4.1.tgz#7f7d127dd60f9fa92ece27c06035c9319c5cab8e" - integrity sha512-zdeOFmFqiXlXCQyHet1qrDDbGKZ7OQTrlzn8DP5N6M/WqN7HaYoUDy1fZ+NY2htL5WzzVFQpDRKzjiOiHaSqgw== +rc-steps@~3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/rc-steps/-/rc-steps-3.5.0.tgz#36b2a7f1f49907b0d90363884b18623caf9fb600" + integrity sha512-2Vkkrpa7PZbg7qPsqTNzVDov4u78cmxofjjnIHiGB9+9rqKS8oTLPzbW2uiWDr3Lk+yGwh8rbpGO1E6VAgBCOg== dependencies: babel-runtime "^6.23.0" classnames "^2.2.3" @@ -8670,138 +8587,87 @@ rc-switch@~1.9.0: prop-types "^15.5.6" react-lifecycles-compat "^3.0.4" -rc-table@~6.6.0: - version "6.6.8" - resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-6.6.8.tgz#4b18bfebc499f37a2a33b2bccd0ddcf3ecd3a9b6" - integrity sha512-G/ICx/jVgWEpnXwVD+WWTm8BjATN0DAWtNFx1O1lxCVs9IY50fZy/GumBpwf91hnWFqlo96Dd/SN50P2O3EM0w== +rc-table@~7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.0.0.tgz#53f4652f661e77cfcda98ed6ece895ea76d12308" + integrity sha512-XVoRsJ1r3Oh1zl8vxVNBD/+4ZFL5hpHcEwEBpJLJ+I+N2uM/fnAYASHqYEkBdvCRv7l0nG0qTeFOB4dQQAHuLA== dependencies: - babel-runtime "6.x" classnames "^2.2.5" component-classes "^1.2.6" lodash "^4.17.5" mini-store "^2.0.0" prop-types "^15.5.8" - rc-util "^4.0.4" + raf "^3.4.1" + rc-resize-observer "^0.1.2" + rc-util "^4.19.0" react-lifecycles-compat "^3.0.2" - shallowequal "^1.0.2" - warning "^3.0.0" + shallowequal "^1.1.0" -rc-tabs@~9.6.4: - version "9.6.4" - resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-9.6.4.tgz#8910f79f0dbfbcb794a3ff879642311fc7c3eff0" - integrity sha512-l4PoDSShNJ6pWGuR1UcUgvee48b3Qu1jgMEaD1hH3Rc+mqysoO7hA9AQ1YywkIy34afGTTejAWDSIFZ0lmg08g== +rc-tabs@~10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-10.0.0.tgz#4db516a66bc731c9a24b44407231262103f6da76" + integrity sha512-kpYho3S8GqHVKuFvsYyShN4GSM+f3RMfgwxmR4lpXA79lzPmIlaLamCGtTnMAOXOVTS3JEltWQCWC8LYY4ITIg== dependencies: babel-runtime "6.x" classnames "2.x" - create-react-context "0.2.2" lodash "^4.17.5" prop-types "15.x" raf "^3.4.1" rc-hammerjs "~0.6.0" rc-util "^4.0.4" resize-observer-polyfill "^1.5.1" - warning "^3.0.0" - -rc-time-picker@~3.7.1: - version "3.7.1" - resolved "https://registry.yarnpkg.com/rc-time-picker/-/rc-time-picker-3.7.1.tgz#35a2c9cbd9758827c1ce57b8817db49472c95cc3" - integrity sha512-ULiLnal/0erk9LrPLcDMroPnqL/LBDT4gz9MzQgtc2QN6KBAOgGihHXZempSQTYCg575oAl+BNX5e1teKWOrjw== - dependencies: - classnames "2.x" - moment "2.x" - prop-types "^15.5.8" - raf "^3.4.1" - rc-trigger "^2.2.0" + warning "^4.0.3" -rc-tooltip@^3.7.0, rc-tooltip@~3.7.3: - version "3.7.3" - resolved "https://registry.yarnpkg.com/rc-tooltip/-/rc-tooltip-3.7.3.tgz#280aec6afcaa44e8dff0480fbaff9e87fc00aecc" - integrity sha512-dE2ibukxxkrde7wH9W8ozHKUO4aQnPZ6qBHtrTH9LoO836PjDdiaWO73fgPB05VfJs9FbZdmGPVEbXCeOP99Ww== +rc-tooltip@^4.0.0, rc-tooltip@~4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/rc-tooltip/-/rc-tooltip-4.0.1.tgz#e7a800571c5661f80dfd411c13a1dabaa9646d3a" + integrity sha512-R+Ift6SwD2bJKhlYgKXyklvurnYwGzNMfRIPBqv0qoG0SYcVJDVuECL73dcRm2+CCik3YYn1ZGZLPjRRrUkAIw== dependencies: - babel-runtime "6.x" - prop-types "^15.5.8" - rc-trigger "^2.2.2" + rc-trigger "^4.0.0" -rc-tree-select@~2.9.1: - version "2.9.1" - resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-2.9.1.tgz#d076b8ce5bf432df3fdd8a6a01cdd9c93c8e7399" - integrity sha512-AfJQC1ZzaeH+Onmx84TtVLUL2guBZe7exA8XSfj1RRB1doDbYGTtybzpP3CEw/tuSftSRnz+iPt+iaxRTrgXRw== - dependencies: - classnames "^2.2.1" - dom-scroll-into-view "^1.2.1" - prop-types "^15.5.8" - raf "^3.4.0" - rc-animate "^2.8.2" - rc-tree "~2.0.0" - rc-trigger "^3.0.0-rc.2" - rc-util "^4.5.0" - react-lifecycles-compat "^3.0.4" - shallowequal "^1.0.2" - warning "^4.0.1" - -rc-tree@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-2.0.0.tgz#68fc4c9ab696943b279a143619e2ecf05918fb53" - integrity sha512-DAT/jsbnFbHqG9Df9OaVG93CAVtTsJVnJiwKX+wqsG8TChpty3s6QX3zJZ+gBgjkq4ikLbu1kuFJtX63EKhSAA== +rc-tree-select@~3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-3.0.2.tgz#a24f26790a06bdc54855b691e289341b44d4343f" + integrity sha512-xowQdNWEUAxtEfJa5X2jcO5iRB/25YlecLwcyPGn04EC0Idwmn94yaji8fM+2QSKWKqvoImppaiRJpA1uljAHg== dependencies: - babel-runtime "^6.23.0" classnames "2.x" - prop-types "^15.5.8" - rc-animate "^2.6.0" - rc-util "^4.5.1" - react-lifecycles-compat "^3.0.4" - warning "^3.0.0" + rc-select "^10.0.0" + rc-tree "^3.0.0" + rc-util "^4.17.0" -rc-tree@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-2.1.0.tgz#ea43c246cf9038fa16be5d08a08c73a38aa6aa61" - integrity sha512-DyHG/W9rW8cYfBrqVrZUep5yt30scyBuYvFnGrU32bh1DUj8GKqOcdoRBaIiOBYurmIiJ02rq6BeBbvVtVp0mw== +rc-tree@^3.0.0, rc-tree@~3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-3.0.1.tgz#25b4c5a3983863ef9a8625d3222dfe81d7e8614c" + integrity sha512-v0B/aN8vikPGAcQoMm5jhxJ5eXj3V0HSHAoHJYXgdad4nqBVyWMDvSWDbZumdFQlBfKhpdGK02LnSgWx4W2SSA== dependencies: - babel-runtime "^6.23.0" classnames "2.x" prop-types "^15.5.8" - rc-animate "^2.6.0" - rc-util "^4.5.1" + rc-animate "^2.9.2" + rc-util "^4.11.0" + rc-virtual-list "^1.0.0" react-lifecycles-compat "^3.0.4" - warning "^4.0.3" -rc-trigger@^2.2.0, rc-trigger@^2.2.2, rc-trigger@^2.3.0, rc-trigger@^2.5.1, rc-trigger@^2.5.4, rc-trigger@^2.6.2: - version "2.6.5" - resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-2.6.5.tgz#140a857cf28bd0fa01b9aecb1e26a50a700e9885" - integrity sha512-m6Cts9hLeZWsTvWnuMm7oElhf+03GOjOLfTuU0QmdB9ZrW7jR2IpI5rpNM7i9MvAAlMAmTx5Zr7g3uu/aMvZAw== +rc-trigger@^4.0.0, rc-trigger@~4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-4.0.0.tgz#c42b8a479941175ed94fc73998fd59cd3c39da77" + integrity sha512-wOr2i4UrhsLjPhT9/k3p8l5yktC0BjOIBk2afze78a9ieql4GEw19Qo6iqSBmX/KqD9V4VXQxD4Ebt7U7IDrIw== dependencies: - babel-runtime "6.x" classnames "^2.2.6" prop-types "15.x" - rc-align "^2.4.0" - rc-animate "2.x" - rc-util "^4.4.0" - react-lifecycles-compat "^3.0.4" - -rc-trigger@^3.0.0-rc.2: - version "3.0.0-rc.3" - resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-3.0.0-rc.3.tgz#35842df1674d25315e1426a44882a4c97652258b" - integrity sha512-4vB6cpxcUdm2qO5VtB9q1TZz0MoWm9BzFLvGknulphGrl1qI6uxUsPDCvqnmujdpDdAKGGfjxntFpA7RtAwkFQ== - dependencies: - babel-runtime "6.x" - classnames "^2.2.6" - prop-types "15.x" - raf "^3.4.0" - rc-align "^2.4.1" - rc-animate "^3.0.0-rc.1" - rc-util "^4.4.0" + raf "^3.4.1" + rc-align "^3.0.0-rc.0" + rc-animate "^2.10.2" + rc-util "^4.15.2" -rc-upload@~2.6.7: - version "2.6.7" - resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-2.6.7.tgz#835d8dceae2c7bdfb7c81211d6ddf02348097146" - integrity sha512-i6roYvM31ue50r0w/MbxOdbbkZHqpJLT29JyjQC2W5i/7w0/lZJkWEmj/DG5WRRJCnVfIiKmXp2437oXnUFNuw== +rc-upload@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-3.0.0.tgz#1365a77405b2df82749e55bcc475ee0de9424370" + integrity sha512-GTmLJ2Habrgon26xwtF8nx1FBxu8KUjRC6QW/7a+NVZ6qXIo+s7HnjqwseuG42kz6xGCoSLNpHgIoHW55EwpxA== dependencies: babel-runtime "6.x" classnames "^2.2.5" - prop-types "^15.5.7" - warning "4.x" -rc-util@^4.0.4, rc-util@^4.1.0, rc-util@^4.1.1, rc-util@^4.3.0, rc-util@^4.4.0, rc-util@^4.5.0, rc-util@^4.5.1, rc-util@^4.6.0, rc-util@^4.8.0: +rc-util@^4.0.4, rc-util@^4.3.0, rc-util@^4.5.1, rc-util@^4.6.0, rc-util@^4.8.0: version "4.8.1" resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-4.8.1.tgz#1ca4faba70b2915e5511fc732805294c38019cee" integrity sha512-siJw/pPunmiQ/YVp/SXNuri3907+GgAmw8TeMVGv9H2LhE/0NlKonuU5CBwPeLQyKdKmJro4EUitEpekwP5osA== @@ -8812,6 +8678,26 @@ rc-util@^4.0.4, rc-util@^4.1.0, rc-util@^4.1.1, rc-util@^4.3.0, rc-util@^4.4.0, react-lifecycles-compat "^3.0.4" shallowequal "^0.2.2" +rc-util@^4.11.0, rc-util@^4.12.0, rc-util@^4.13.0, rc-util@^4.15.2, rc-util@^4.15.3, rc-util@^4.16.1, rc-util@^4.17.0, rc-util@^4.19.0, rc-util@^4.20.0, rc-util@^4.9.0: + version "4.20.0" + resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-4.20.0.tgz#fb601c59bb48cbee38538e0d5b628addda6a8c30" + integrity sha512-rUqk4RqtDe4OfTsSk2GpbvIQNVtfmmebw4Rn7ZAA1TO1zLMLfyOF78ZyrEKqs8RDwoE3S1aXp0AX0ogLfSxXrQ== + dependencies: + add-dom-event-listener "^1.1.0" + babel-runtime "6.x" + prop-types "^15.5.10" + react-is "^16.12.0" + react-lifecycles-compat "^3.0.4" + shallowequal "^1.1.0" + +rc-virtual-list@^1.0.0, rc-virtual-list@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-1.0.0.tgz#34a755c48e9c6e50ac6d0155017134859af8f0b0" + integrity sha512-t6q0/GiH5qp5k2VRDeIrrS1Z2r8ey0fnVQN5HIu6ildvXqRfgm4MbNnUeoUywNt+et4XhDFBGmiEhRvIs6vujQ== + dependencies: + classnames "^2.2.6" + rc-util "^4.8.0" + rc@^1.1.6, rc@^1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" @@ -8879,14 +8765,14 @@ react-dom-factories@^1.0.0: resolved "https://registry.yarnpkg.com/react-dom-factories/-/react-dom-factories-1.0.2.tgz#eb7705c4db36fb501b3aa38ff759616aa0ff96e0" react-dom@^16.8.3: - version "16.8.6" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f" - integrity sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA== + version "16.13.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.0.tgz#cdde54b48eb9e8a0ca1b3dc9943d9bb409b81866" + integrity sha512-y09d2c4cG220DzdlFkPTnVvGTszVvNpC73v+AaLGLHbkpy3SSgvYq8x0rNwPJ/Rk/CicTNgk0hbHNw1gMEZAXg== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - scheduler "^0.13.6" + scheduler "^0.19.0" react-error-overlay@^5.1.0: version "5.1.0" @@ -8914,11 +8800,16 @@ react-image@^2.2.1: dependencies: prop-types "15.7.2" -react-is@^16.10.2, react-is@^16.8.1, react-is@^16.8.6, react-is@^16.9.0: +react-is@^16.10.2, react-is@^16.8.6, react-is@^16.9.0: version "16.10.2" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.10.2.tgz#984120fd4d16800e9a738208ab1fba422d23b5ab" integrity sha512-INBT1QEgtcCCgvccr5/86CfD71fw9EPmDxgiJX4I2Ddr6ZsV6iFXsuby+qWJPtmNuMY0zByTsG4468P7nHuNWA== +react-is@^16.12.0, react-is@^16.6.0, react-is@^16.8.1: + version "16.13.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527" + integrity sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA== + react-is@^16.7.0, react-is@^16.8.2: version "16.8.6" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16" @@ -8930,16 +8821,6 @@ react-latex-next@^1.1.0: dependencies: katex "^0.10.0-beta" -react-lazy-load@^3.0.13: - version "3.0.13" - resolved "https://registry.yarnpkg.com/react-lazy-load/-/react-lazy-load-3.0.13.tgz#3b0a92d336d43d3f0d73cbe6f35b17050b08b824" - integrity sha1-OwqS0zbUPT8Nc8vm81sXBQsIuCQ= - dependencies: - eventlistener "0.0.1" - lodash.debounce "^4.0.0" - lodash.throttle "^4.0.0" - prop-types "^15.5.8" - react-lifecycles-compat@^3.0.2, react-lifecycles-compat@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" @@ -8952,8 +8833,9 @@ react-loadable@^5.4.0: prop-types "^15.5.0" react-media@^1.9.2: - version "1.9.2" - resolved "https://registry.yarnpkg.com/react-media/-/react-media-1.9.2.tgz#423ee12f952e1d69f1b994a58d3cbed21a92b370" + version "1.10.0" + resolved "https://registry.yarnpkg.com/react-media/-/react-media-1.10.0.tgz#7b0c5fe8ac55a53ce31b5249db3aaf8a22ff7703" + integrity sha512-FjgYmFoaPTImST06jqotuu0Mk8LOXiGYS/fIyiXuLnf20l3DPniBwtrxi604/HxxjqvmHS3oz5rAwnqdvosV4A== dependencies: "@babel/runtime" "^7.2.0" invariant "^2.2.2" @@ -8996,30 +8878,34 @@ react-redux@^6.0.0: prop-types "^15.7.2" react-is "^16.8.2" -react-router-dom@^4.2.2: - version "4.3.1" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz#4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6" - integrity sha512-c/MlywfxDdCp7EnB7YfPMOfMD3tOtIjrQlj/CKfNMBxdmpJP8xcz5P/UAFn3JbnQCNUxsHyVVqllF9LhgVyFCA== +react-router-dom@^5.1.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.1.2.tgz#06701b834352f44d37fbb6311f870f84c76b9c18" + integrity sha512-7BPHAaIwWpZS074UKaw1FjVdZBSVWEk8IuDXdB+OkLb8vd/WRQIpA4ag9WQk61aEfQs47wHyjWUoUGGZxpQXew== dependencies: - history "^4.7.2" - invariant "^2.2.4" + "@babel/runtime" "^7.1.2" + history "^4.9.0" loose-envify "^1.3.1" - prop-types "^15.6.1" - react-router "^4.3.1" - warning "^4.0.1" + prop-types "^15.6.2" + react-router "5.1.2" + tiny-invariant "^1.0.2" + tiny-warning "^1.0.0" -react-router@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz#aada4aef14c809cb2e686b05cee4742234506c4e" - integrity sha512-yrvL8AogDh2X42Dt9iknk4wF4V8bWREPirFfS9gLU1huk6qK41sg7Z/1S81jjTrGHxa3B8R3J6xIkDAA6CVarg== +react-router@5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.1.2.tgz#6ea51d789cb36a6be1ba5f7c0d48dd9e817d3418" + integrity sha512-yjEuMFy1ONK246B+rsa0cUam5OeAQ8pyclRDgpxuSCrAlJ1qN9uZ5IgyKC7gQg0w8OM50NXHEegPh/ks9YuR2A== dependencies: - history "^4.7.2" - hoist-non-react-statics "^2.5.0" - invariant "^2.2.4" + "@babel/runtime" "^7.1.2" + history "^4.9.0" + hoist-non-react-statics "^3.1.0" loose-envify "^1.3.1" + mini-create-react-context "^0.3.0" path-to-regexp "^1.7.0" - prop-types "^15.6.1" - warning "^4.0.1" + prop-types "^15.6.2" + react-is "^16.6.0" + tiny-invariant "^1.0.2" + tiny-warning "^1.0.0" react-sanitized-html@^2.0.0: version "2.0.0" @@ -9139,17 +9025,6 @@ react-side-effect@^1.1.0: dependencies: shallowequal "^1.0.1" -react-slick@~0.24.0: - version "0.24.0" - resolved "https://registry.yarnpkg.com/react-slick/-/react-slick-0.24.0.tgz#1a4e078a82de4e9458255d9ce26aa6f3b17b168b" - integrity sha512-Pvo0B74ohumQdYOf0qP+pdQpj9iUbAav7+2qiF3uTc5XeQp/Y/cnIeDBM2tB3txthfSe05jKIqLMJTS6qVvt5g== - dependencies: - classnames "^2.2.5" - enquire.js "^2.1.6" - json2mq "^0.2.0" - lodash.debounce "^4.0.8" - resize-observer-polyfill "^1.5.0" - react-test-renderer@^16.0.0-0, react-test-renderer@^16.2.0: version "16.10.2" resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.10.2.tgz#4d8492f8678c9b43b721a7d79ed0840fdae7c518" @@ -9184,14 +9059,13 @@ react-vis@^1.9.2: react-motion "^0.5.2" react@^16.8.3: - version "16.8.6" - resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe" - integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw== + version "16.13.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.13.0.tgz#d046eabcdf64e457bbeed1e792e235e1b9934cf7" + integrity sha512-TSavZz2iSLkq5/oiE7gnFzmURKZMltmi193rm5HEoUDAXpzT9Kzw6oNZnGoai/4+fUnm7FqS5dwgUL34TujcWQ== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - scheduler "^0.13.6" read-pkg-up@^1.0.1: version "1.0.1" @@ -9345,6 +9219,7 @@ regenerator-runtime@^0.11.0: regenerator-runtime@^0.12.0: version "0.12.1" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de" + integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg== regenerator-runtime@^0.13.2: version "0.13.2" @@ -9543,6 +9418,11 @@ resolve-pathname@^2.2.0: resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879" integrity sha512-bAFz9ld18RzJfddgrO2e/0S2O81710++chRMUxHjXOYKF6jTAMrUNZrEZ1PvV0zlhfjidm08iRPdTLPno1FuRg== +resolve-pathname@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd" + integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng== + resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" @@ -9695,14 +9575,6 @@ sax@^1.2.4, sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" -scheduler@^0.13.6: - version "0.13.6" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889" - integrity sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - scheduler@^0.16.2: version "0.16.2" resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.16.2.tgz#f74cd9d33eff6fc554edfb79864868e4819132c1" @@ -9719,6 +9591,14 @@ scheduler@^0.17.0: loose-envify "^1.1.0" object-assign "^4.1.1" +scheduler@^0.19.0: + version "0.19.0" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.0.tgz#a715d56302de403df742f4a9be11975b32f5698d" + integrity sha512-xowbVaTPe9r7y7RUejcK73/j8tt2jfiyTednOvHbA8JoClvMYCp+r8QegLwK/n8zWQAtZb1fFnER4XLBZXrCxA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + schema-utils@^0.4.4, schema-utils@^0.4.5: version "0.4.7" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187" @@ -9734,6 +9614,13 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" +scroll-into-view-if-needed@^2.2.20: + version "2.2.24" + resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.24.tgz#12bca532990769bd509115a49edcfa755e92a0ea" + integrity sha512-vsC6SzyIZUyJG8o4nbUDCiIwsPdH6W/FVmjT2avR2hp/yzS53JjGmg/bKD20TkoNajbu5dAQN4xR7yes4qhwtQ== + dependencies: + compute-scroll-into-view "^1.0.13" + scss-tokenizer@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" @@ -9867,11 +9754,6 @@ shallow-clone@^1.0.0: kind-of "^5.0.0" mixin-object "^2.0.1" -shallow-equal@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shallow-equal/-/shallow-equal-1.2.0.tgz#fd828d2029ff4e19569db7e19e535e94e2d1f5cc" - integrity sha512-Z21pVxR4cXsfwpMKMhCEIO1PCi5sp7KEp+CmOpBQ+E8GpHwKOw2sEzk7sgblM3d/j4z4gakoWEoPcjK0VJQogA== - shallowequal@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-0.2.2.tgz#1e32fd5bcab6ad688a4812cb0cc04efc75c7014e" @@ -10543,7 +10425,12 @@ timsort@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" -tiny-warning@^1.0.2: +tiny-invariant@^1.0.2: + version "1.1.0" + resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz#634c5f8efdc27714b7f386c35e6760991d230875" + integrity sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw== + +tiny-warning@^1.0.0, tiny-warning@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== @@ -10892,6 +10779,11 @@ value-equal@^0.4.0: resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz#c5bdd2f54ee093c04839d71ce2e4758a6890abc7" integrity sha512-x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw== +value-equal@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" + integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw== + vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" @@ -10926,13 +10818,6 @@ walker@~1.0.5: dependencies: makeerror "1.0.x" -warning@4.x, warning@^4.0.1, warning@^4.0.2, warning@^4.0.3, warning@~4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3" - integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w== - dependencies: - loose-envify "^1.0.0" - warning@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c" @@ -10940,6 +10825,13 @@ warning@^3.0.0: dependencies: loose-envify "^1.0.0" +warning@^4.0.1, warning@^4.0.3, warning@~4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3" + integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w== + dependencies: + loose-envify "^1.0.0" + watch@~0.18.0: version "0.18.0" resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"