ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

instUI5 upgrade: calendar/scheduler stuff 

refs: CORE-1437

This commit just upgrades these components to use instUI 5 instead of 
getting them from ui-core in instUI 4. 

It is mostly just path renaming.

Test plan:
* verify these components still work as they used to and tests pass

Change-Id: I84d653eac1662b82ddffa03e92fa874a4fa849af
Reviewed-on: https://gerrit.instructure.com/151773
Tested-by: Jenkins
Reviewed-by: Brent Burgoyne <bburgoyne@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
This commit is contained in:
Ryan Shaw 2018-05-29 14:15:38 -06:00
parent 96dc2f4269
commit c471dbebd9
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/coffeescripts/calendar/CalendarEvent.js
View File

@ -17,7 +17,7 @@
import React from 'react' import React from 'react'
import ReactDOM from 'react-dom' import ReactDOM from 'react-dom'
import Spinner from '@instructure/ui-core/lib/components/Spinner' import Spinner from '@instructure/ui-elements/lib/components/Spinner'
import $ from 'jquery' import $ from 'jquery'
import _ from 'underscore' import _ from 'underscore'
import Backbone from 'Backbone' import Backbone from 'Backbone'

6
app/jsx/calendar/scheduler/components/appointment_groups/AppointmentGroupList.js
View File

@ -21,9 +21,9 @@ import PropTypes from 'prop-types'
import classnames from 'classnames' import classnames from 'classnames'
import I18n from 'i18n!appointment_groups' import I18n from 'i18n!appointment_groups'
import natcompare from 'compiled/util/natcompare' import natcompare from 'compiled/util/natcompare'
import Grid, { GridRow, GridCol } from '@instructure/ui-core/lib/components/Grid' import Grid, { GridRow, GridCol } from '@instructure/ui-layout/lib/components/Grid'
import Text from '@instructure/ui-core/lib/components/Text' import Text from '@instructure/ui-elements/lib/components/Text'
import Pill from '@instructure/ui-core/lib/components/Pill' import Pill from '@instructure/ui-elements/lib/components/Pill'
import IconCalendarAddLine from '@instructure/ui-icons/lib/Line/IconCalendarAdd' import IconCalendarAddLine from '@instructure/ui-icons/lib/Line/IconCalendarAdd'
import IconCalendarReservedLine from '@instructure/ui-icons/lib/Line/IconCalendarReserved' import IconCalendarReservedLine from '@instructure/ui-icons/lib/Line/IconCalendarReserved'
import $ from 'jquery' import $ from 'jquery'

4
app/jsx/calendar/scheduler/components/appointment_groups/ContextSelector.js
View File

@ -19,10 +19,10 @@
import React from 'react' import React from 'react'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import I18n from 'i18n!appointment_groups' import I18n from 'i18n!appointment_groups'
import Button from '@instructure/ui-core/lib/components/Button' import Button from '@instructure/ui-buttons/lib/components/Button'
import IconMiniArrowRight from '@instructure/ui-icons/lib/Solid/IconMiniArrowRight' import IconMiniArrowRight from '@instructure/ui-icons/lib/Solid/IconMiniArrowRight'
import IconMiniArrowDown from '@instructure/ui-icons/lib/Solid/IconMiniArrowDown' import IconMiniArrowDown from '@instructure/ui-icons/lib/Solid/IconMiniArrowDown'
import Grid, { GridCol, GridRow } from '@instructure/ui-core/lib/components/Grid' import Grid, { GridCol, GridRow } from '@instructure/ui-layout/lib/components/Grid'
class ContextSelector extends React.Component { class ContextSelector extends React.Component {
static propTypes = { static propTypes = {

16
app/jsx/calendar/scheduler/components/appointment_groups/EditPage.js
View File

@ -20,14 +20,14 @@ import $ from 'jquery'
import React from 'react' import React from 'react'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import I18n from 'i18n!appointment_groups' import I18n from 'i18n!appointment_groups'
import Breadcrumb, { BreadcrumbLink } from '@instructure/ui-core/lib/components/Breadcrumb' import Breadcrumb, { BreadcrumbLink } from '@instructure/ui-breadcrumb/lib/components/Breadcrumb'
import Button from '@instructure/ui-core/lib/components/Button' import Button from '@instructure/ui-buttons/lib/components/Button'
import Grid, { GridCol, GridRow } from '@instructure/ui-core/lib/components/Grid' import Grid, { GridCol, GridRow } from '@instructure/ui-layout/lib/components/Grid'
import FormFieldGroup from '@instructure/ui-core/lib/components/FormFieldGroup' import FormFieldGroup from '@instructure/ui-forms/lib/components/FormFieldGroup'
import ScreenReaderContent from '@instructure/ui-core/lib/components/ScreenReaderContent' import ScreenReaderContent from '@instructure/ui-a11y/lib/components/ScreenReaderContent'
import TextArea from '@instructure/ui-core/lib/components/TextArea' import TextArea from '@instructure/ui-forms/lib/components/TextArea'
import TextInput from '@instructure/ui-core/lib/components/TextInput' import TextInput from '@instructure/ui-forms/lib/components/TextInput'
import Checkbox from '@instructure/ui-core/lib/components/Checkbox' import Checkbox from '@instructure/ui-forms/lib/components/Checkbox'
import 'compiled/jquery.rails_flash_notifications' import 'compiled/jquery.rails_flash_notifications'
import 'jquery.instructure_forms' import 'jquery.instructure_forms'
import 'jquery.instructure_date_and_time' import 'jquery.instructure_date_and_time'

4
app/jsx/calendar/scheduler/components/appointment_groups/TimeBlockSelectRow.js
View File

@ -20,8 +20,8 @@ import $ from 'jquery'
import React from 'react' import React from 'react'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import I18n from 'i18n!appointment_groups' import I18n from 'i18n!appointment_groups'
import Button from '@instructure/ui-core/lib/components/Button' import Button from '@instructure/ui-buttons/lib/components/Button'
import Text from '@instructure/ui-core/lib/components/Text' import Text from '@instructure/ui-elements/lib/components/Text'
import IconXSolid from '@instructure/ui-icons/lib/Solid/IconX' import IconXSolid from '@instructure/ui-icons/lib/Solid/IconX'
import coupleTimeFields from 'compiled/util/coupleTimeFields' import coupleTimeFields from 'compiled/util/coupleTimeFields'
import 'jquery.instructure_date_and_time' import 'jquery.instructure_date_and_time'

8
app/jsx/calendar/scheduler/components/appointment_groups/TimeBlockSelector.js
View File

@ -23,10 +23,10 @@ import PropTypes from 'prop-types'
import I18n from 'i18n!appointment_groups' import I18n from 'i18n!appointment_groups'
import TimeBlockListManager from 'compiled/calendar/TimeBlockListManager' import TimeBlockListManager from 'compiled/calendar/TimeBlockListManager'
import 'jquery.instructure_date_and_time' import 'jquery.instructure_date_and_time'
import FormFieldGroup from '@instructure/ui-core/lib/components/FormFieldGroup' import FormFieldGroup from '@instructure/ui-forms/lib/components/FormFieldGroup'
import NumberInput from '@instructure/ui-core/lib/components/NumberInput' import NumberInput from '@instructure/ui-forms/lib/components/NumberInput'
import ScreenReaderContent from '@instructure/ui-core/lib/components/ScreenReaderContent' import ScreenReaderContent from '@instructure/ui-a11y/lib/components/ScreenReaderContent'
import Button from '@instructure/ui-core/lib/components/Button' import Button from '@instructure/ui-buttons/lib/components/Button'
import TimeBlockSelectRow from './TimeBlockSelectRow' import TimeBlockSelectRow from './TimeBlockSelectRow'
const uniqueId = (() => { const uniqueId = (() => {