diff --git a/reviewboard/static/rb/js/common/actions/views/menuActionView.ts b/reviewboard/static/rb/js/common/actions/views/menuActionView.ts index aaf352cd3bcad9423e8adc5dcc0eb7376f9e7f2e..95e8727fbbba6485e3d3289cf747b30f609fe4db 100644 --- a/reviewboard/static/rb/js/common/actions/views/menuActionView.ts +++ b/reviewboard/static/rb/js/common/actions/views/menuActionView.ts @@ -1,9 +1,9 @@ import { EventsHash, spina } from '@beanbag/spina'; -import { MenuView } from 'reviewboard/ui/views/menuView'; +import { MenuView } from 'reviewboard/ui'; -import { ActionView } from './actionView'; import { MenuAction } from '../models/menuActionModel'; +import { ActionView } from './actionView'; /** diff --git a/reviewboard/static/rb/js/common/models/tests/commChannelModelTests.ts b/reviewboard/static/rb/js/common/models/tests/commChannelModelTests.ts index f09de788153a255beb7ff78f3bee69e8f3208475..c3ba0a1b03c231cd96a47142473993b48f0c0a38 100644 --- a/reviewboard/static/rb/js/common/models/tests/commChannelModelTests.ts +++ b/reviewboard/static/rb/js/common/models/tests/commChannelModelTests.ts @@ -9,8 +9,8 @@ import { suite, } from 'jasmine-core'; -import { ClientCommChannel } from '../commChannelModel'; import { PageView } from '../../views/pageView'; +import { ClientCommChannel } from '../commChannelModel'; declare const $testsScratch: JQuery; diff --git a/reviewboard/static/rb/js/common/models/tests/userSessionModelTests.ts b/reviewboard/static/rb/js/common/models/tests/userSessionModelTests.ts index 6e1eeef85469e6d8dbb3e14637f945df704a6b5f..c492b7820d72530b14038d7116ac842ad3dbff79 100644 --- a/reviewboard/static/rb/js/common/models/tests/userSessionModelTests.ts +++ b/reviewboard/static/rb/js/common/models/tests/userSessionModelTests.ts @@ -7,7 +7,7 @@ import { suite, } from 'jasmine-core'; -import { UserSession } from '../userSessionModel'; +import { UserSession } from 'reviewboard/common'; declare const SITE_ROOT: string; diff --git a/reviewboard/static/rb/js/common/resources/collections/tests/resourceCollectionTests.ts b/reviewboard/static/rb/js/common/resources/collections/tests/resourceCollectionTests.ts index 55684d5ab01c2200c435bbe988e5ff843200325b..0777a618bd24c3a4bdee76859b72a6141a8c4c2d 100644 --- a/reviewboard/static/rb/js/common/resources/collections/tests/resourceCollectionTests.ts +++ b/reviewboard/static/rb/js/common/resources/collections/tests/resourceCollectionTests.ts @@ -8,8 +8,8 @@ import { } from 'jasmine-core'; import { BaseCollection } from '../../../collections/baseCollection'; -import { ResourceCollection } from '../resourceCollection'; import { Review } from '../../models/reviewModel'; +import { ResourceCollection } from '../resourceCollection'; suite('rb/resources/collections/ResourceCollection', function() { diff --git a/reviewboard/static/rb/js/common/resources/models/draftResourceModelMixin.ts b/reviewboard/static/rb/js/common/resources/models/draftResourceModelMixin.ts index 24c6be129cfd79455d0c5063e81a8a405e34df93..2038fc600dc6a166630107dd419f5b81d40039a6 100644 --- a/reviewboard/static/rb/js/common/resources/models/draftResourceModelMixin.ts +++ b/reviewboard/static/rb/js/common/resources/models/draftResourceModelMixin.ts @@ -2,7 +2,7 @@ * Mixin for resources that have special "draft" URLs. */ -import { UserSession } from 'reviewboard/common/models/userSessionModel'; +import { UserSession } from 'reviewboard/common'; /** diff --git a/reviewboard/static/rb/js/common/resources/models/reviewModel.ts b/reviewboard/static/rb/js/common/resources/models/reviewModel.ts index f3b4668b395decc32af254e09c389e8c73132bf7..d640fde872920ac48c3c0ae1a86ccbe50f46cfe2 100644 --- a/reviewboard/static/rb/js/common/resources/models/reviewModel.ts +++ b/reviewboard/static/rb/js/common/resources/models/reviewModel.ts @@ -4,9 +4,9 @@ import { spina } from '@beanbag/spina'; +import * as JSONSerializers from '../utils/serializers'; import { BaseResource, BaseResourceAttrs } from './baseResourceModel'; import { ReviewReply } from './reviewReplyModel'; -import * as JSONSerializers from '../utils/serializers'; /** diff --git a/reviewboard/static/rb/js/common/resources/models/reviewReplyModel.ts b/reviewboard/static/rb/js/common/resources/models/reviewReplyModel.ts index eebc2c1fc8f8fd452255368ae46c8dc0fd314a03..56e15bcb86482004aa01055eefdea162684a2654 100644 --- a/reviewboard/static/rb/js/common/resources/models/reviewReplyModel.ts +++ b/reviewboard/static/rb/js/common/resources/models/reviewReplyModel.ts @@ -4,10 +4,10 @@ import { spina } from '@beanbag/spina'; +import * as JSONSerializers from '../utils/serializers'; import { BaseResource, BaseResourceAttrs} from './baseResourceModel'; import { DraftResourceModelMixin } from './draftResourceModelMixin'; import { Review } from './reviewModel'; -import * as JSONSerializers from '../utils/serializers'; /** diff --git a/reviewboard/static/rb/js/reviewRequestPage/views/reviewReplyDraftBannerView.ts b/reviewboard/static/rb/js/reviewRequestPage/views/reviewReplyDraftBannerView.ts index 5000f5aa16a9e7dadbebf9abee22ae0b170454d1..ea0098453c57133b661353bed7319457a7558f5a 100644 --- a/reviewboard/static/rb/js/reviewRequestPage/views/reviewReplyDraftBannerView.ts +++ b/reviewboard/static/rb/js/reviewRequestPage/views/reviewReplyDraftBannerView.ts @@ -1,15 +1,11 @@ import { BaseView, EventsHash, spina } from '@beanbag/spina'; +import { ReviewReply } from 'reviewboard/common'; +import { ReviewRequestEditor } from 'reviewboard/reviews'; +import { FloatingBannerView } from 'reviewboard/ui'; import { - FloatingBannerView, FloatingBannerViewOptions, } from 'reviewboard/ui/views/floatingBannerView'; -import { - ReviewReply, -} from 'reviewboard/common/resources/models/reviewReplyModel'; -import { - ReviewRequestEditor, -} from 'reviewboard/reviews/models/reviewRequestEditorModel'; /** diff --git a/reviewboard/static/rb/js/reviews/models/commentEditorModel.ts b/reviewboard/static/rb/js/reviews/models/commentEditorModel.ts index d6dd205d05c7c333c40ab68537c2dd1867c92081..480e1d78da1740ad82f7c6390a499ae80e1fd238 100644 --- a/reviewboard/static/rb/js/reviews/models/commentEditorModel.ts +++ b/reviewboard/static/rb/js/reviews/models/commentEditorModel.ts @@ -1,8 +1,10 @@ /** The state for editing a new or existing draft comment. */ import { BaseModel, spina } from '@beanbag/spina'; -import { ExtraDataMixin } from 'reviewboard/common/models/extraDataMixin'; -import { UserSession } from 'reviewboard/common/models/userSessionModel'; +import { + ExtraDataMixin, + UserSession, +} from 'reviewboard/common'; import { ReviewRequestEditor } from './reviewRequestEditorModel'; diff --git a/reviewboard/static/rb/js/reviews/models/reviewablePageModel.ts b/reviewboard/static/rb/js/reviews/models/reviewablePageModel.ts index 5a11ca0040e3944cf92b6f42724aacef5e4fd03c..ccac3b04ea885c0b21869d77e13ff3711e009983 100644 --- a/reviewboard/static/rb/js/reviews/models/reviewablePageModel.ts +++ b/reviewboard/static/rb/js/reviews/models/reviewablePageModel.ts @@ -3,8 +3,10 @@ */ import { ModelAttributes, spina } from '@beanbag/spina'; -import { Page } from 'reviewboard/common/models/pageModel'; -import { Review } from 'reviewboard/common/resources/models/reviewModel'; +import { + Page, + Review, +} from 'reviewboard/common'; import { ReviewRequestEditor, diff --git a/reviewboard/static/rb/js/reviews/models/tests/commentEditorModelTests.ts b/reviewboard/static/rb/js/reviews/models/tests/commentEditorModelTests.ts index 2729e3347db343be468a9a2bbb5b13ac64e71009..e891c97e7d6c2e769f071d4017eda983f8c3e8e1 100644 --- a/reviewboard/static/rb/js/reviews/models/tests/commentEditorModelTests.ts +++ b/reviewboard/static/rb/js/reviews/models/tests/commentEditorModelTests.ts @@ -7,11 +7,11 @@ import { suite, } from 'jasmine-core'; -import { UserSession } from 'reviewboard/common/models/userSessionModel'; - import { BaseResource, -} from 'reviewboard/common/resources/models/baseResourceModel'; + UserSession, +} from 'reviewboard/common'; + import { CommentEditor } from '../commentEditorModel'; diff --git a/reviewboard/static/rb/js/reviews/models/tests/diffViewerPageModelTests.ts b/reviewboard/static/rb/js/reviews/models/tests/diffViewerPageModelTests.ts index 7359beba8eea41db38b8769456f75980dccaf4cb..b5412a039164019118a318edc559d5cb27e44b7f 100644 --- a/reviewboard/static/rb/js/reviews/models/tests/diffViewerPageModelTests.ts +++ b/reviewboard/static/rb/js/reviews/models/tests/diffViewerPageModelTests.ts @@ -7,9 +7,7 @@ import { suite, } from 'jasmine-core'; -import { - DiffViewerPage, -} from 'reviewboard/reviews/models/diffViewerPageModel'; +import { DiffViewerPage } from '../diffViewerPageModel'; suite('rb/pages/models/DiffViewerPage', function() { diff --git a/reviewboard/static/rb/js/reviews/models/tests/reviewablePageModelTests.ts b/reviewboard/static/rb/js/reviews/models/tests/reviewablePageModelTests.ts index ec4f9a3466a5f8d5a38342d89d1ed34c63d1dcb8..9339d0608895841849e37c48385b49ffeec05b92 100644 --- a/reviewboard/static/rb/js/reviews/models/tests/reviewablePageModelTests.ts +++ b/reviewboard/static/rb/js/reviews/models/tests/reviewablePageModelTests.ts @@ -6,10 +6,8 @@ import { suite, } from 'jasmine-core'; -import { Review } from 'reviewboard/common/resources/models/reviewModel'; -import { - ReviewablePage, -} from 'reviewboard/reviews/models/reviewablePageModel'; +import { Review } from 'reviewboard/common'; +import { ReviewablePage } from '../reviewablePageModel'; suite('rb/pages/models/ReviewablePage', function() { diff --git a/reviewboard/static/rb/js/reviews/models/unifiedBannerModel.ts b/reviewboard/static/rb/js/reviews/models/unifiedBannerModel.ts index dad2a1e52e86becbdb399add5172e9547c827179..3376f4ed6bd4eaf30acade999829eec77f9cd354 100644 --- a/reviewboard/static/rb/js/reviews/models/unifiedBannerModel.ts +++ b/reviewboard/static/rb/js/reviews/models/unifiedBannerModel.ts @@ -3,10 +3,10 @@ */ import { BaseModel, spina } from '@beanbag/spina'; -import { Review } from 'reviewboard/common/resources/models/reviewModel'; import { + Review, ReviewReply, -} from 'reviewboard/common/resources/models/reviewReplyModel'; +} from 'reviewboard/common'; import { ReviewRequestEditor } from './reviewRequestEditorModel'; diff --git a/reviewboard/static/rb/js/reviews/views/commentDialogView.ts b/reviewboard/static/rb/js/reviews/views/commentDialogView.ts index 319d801ee344a3b2ef11e0312d8592e5df48f642..a5218cc503c12e9b93b1fcaa08b28725b981ba3b 100644 --- a/reviewboard/static/rb/js/reviews/views/commentDialogView.ts +++ b/reviewboard/static/rb/js/reviews/views/commentDialogView.ts @@ -3,9 +3,11 @@ */ import { BaseView, EventsHash, spina } from '@beanbag/spina'; -import { EnabledFeatures } from 'reviewboard/common'; -import { TextEditorView } from 'reviewboard/ui/views/textEditorView'; -import { UserSession } from 'reviewboard/common/models/userSessionModel'; +import { + EnabledFeatures, + UserSession, +} from 'reviewboard/common'; +import { TextEditorView } from 'reviewboard/ui'; import { CommentEditor } from '../models/commentEditorModel'; import { ReviewRequestEditor } from '../models/reviewRequestEditorModel'; diff --git a/reviewboard/static/rb/js/reviews/views/diffViewerPageView.ts b/reviewboard/static/rb/js/reviews/views/diffViewerPageView.ts index c0dea0951d0970a3466032e3d912b3b5082083c4..be4d183aba0a8c8edc02f781822ec60c99900439 100644 --- a/reviewboard/static/rb/js/reviews/views/diffViewerPageView.ts +++ b/reviewboard/static/rb/js/reviews/views/diffViewerPageView.ts @@ -3,10 +3,10 @@ */ import { Router, spina } from '@beanbag/spina'; -import { UserSession } from 'reviewboard/common/models/userSessionModel'; +import { UserSession } from 'reviewboard/common'; -import { DiffFileIndexView } from './diffFileIndexView'; import { DiffViewerPage } from '../models/diffViewerPageModel'; +import { DiffFileIndexView } from './diffFileIndexView'; import { ReviewablePageView, ReviewablePageViewOptions, diff --git a/reviewboard/static/rb/js/reviews/views/reviewDialogView.ts b/reviewboard/static/rb/js/reviews/views/reviewDialogView.ts index 9387d313b067cb1c8f2503b67c53deb7b31ab270..bce66d21783aa95d86a5cb02b8b36c3708cde742 100644 --- a/reviewboard/static/rb/js/reviews/views/reviewDialogView.ts +++ b/reviewboard/static/rb/js/reviews/views/reviewDialogView.ts @@ -4,18 +4,18 @@ import { BaseView, spina } from '@beanbag/spina'; -import { ClientCommChannel } from 'reviewboard/common/models/commChannelModel'; -import { EnabledFeatures } from 'reviewboard/common'; -import { MenuButtonView } from 'reviewboard/ui/views/menuButtonView'; import { + ClientCommChannel, + EnabledFeatures, ResourceCollection, -} from 'reviewboard/common/resources/collections/resourceCollection'; -import { Review } from 'reviewboard/common/resources/models/reviewModel'; + Review, + UserSession, +} from 'reviewboard/common'; import { + MenuButtonView, RichTextInlineEditorView, -} from 'reviewboard/ui/views/inlineEditorView'; -import { TextEditorView } from 'reviewboard/ui/views/textEditorView'; -import { UserSession } from 'reviewboard/common/models/userSessionModel'; + TextEditorView, +} from 'reviewboard/ui'; import { ReviewRequestEditor } from '../models/reviewRequestEditorModel'; diff --git a/reviewboard/static/rb/js/reviews/views/reviewRequestActions.ts b/reviewboard/static/rb/js/reviews/views/reviewRequestActions.ts index d9dcdd7ba82ffd133ac9e943b97789f47d7e4f18..2016d27664de8c0591a305139f89b311ebddd1f1 100644 --- a/reviewboard/static/rb/js/reviews/views/reviewRequestActions.ts +++ b/reviewboard/static/rb/js/reviews/views/reviewRequestActions.ts @@ -1,13 +1,13 @@ import { EventsHash, spina } from '@beanbag/spina'; -import { Actions } from 'reviewboard/common/actions'; import { + Actions, BaseResource, -} from 'reviewboard/common/resources/models/baseResourceModel'; -import { UserSession } from 'reviewboard/common/models/userSessionModel'; -import { OverlayView } from 'reviewboard/ui/views/overlayView'; + UserSession, +} from 'reviewboard/common'; +import { OverlayView } from 'reviewboard/ui'; -import { ReviewDialogView} from './reviewDialogView'; +import { ReviewDialogView } from './reviewDialogView'; declare const SITE_ROOT: string; diff --git a/reviewboard/static/rb/js/reviews/views/reviewRequestEditorView.ts b/reviewboard/static/rb/js/reviews/views/reviewRequestEditorView.ts index ea21d11c39818e9c0598004cca3ccb2423e9b181..b8e1f34ea1b2fa8654e422de8b03ff14123e9610 100644 --- a/reviewboard/static/rb/js/reviews/views/reviewRequestEditorView.ts +++ b/reviewboard/static/rb/js/reviews/views/reviewRequestEditorView.ts @@ -3,17 +3,19 @@ */ import { BaseView, spina } from '@beanbag/spina'; -import { DnDUploader } from 'reviewboard/ui/views/dndUploaderView'; -import { EnabledFeatures } from 'reviewboard/common'; -import { UserSession } from 'reviewboard/common/models/userSessionModel'; +import { + EnabledFeatures, + UserSession, +} from 'reviewboard/common'; +import { DnDUploader } from 'reviewboard/ui'; +import { ReviewRequestEditor } from '../models/reviewRequestEditorModel'; import { BaseFieldView, ChangeDescriptionFieldView, CloseDescriptionFieldView, TextFieldView, } from './reviewRequestFieldViews'; -import { ReviewRequestEditor } from '../models/reviewRequestEditorModel'; declare const dedent: (string) => string; diff --git a/reviewboard/static/rb/js/reviews/views/reviewablePageView.ts b/reviewboard/static/rb/js/reviews/views/reviewablePageView.ts index 8a783c7ea13645d463e4face69cc57ee00776ea8..6ffc126ee46ad5f2924b8459fbce2a904b1d9a4e 100644 --- a/reviewboard/static/rb/js/reviews/views/reviewablePageView.ts +++ b/reviewboard/static/rb/js/reviews/views/reviewablePageView.ts @@ -3,16 +3,19 @@ */ import { BaseView, EventsHash, spina } from '@beanbag/spina'; -import { DnDUploader } from 'reviewboard/ui/views/dndUploaderView'; -import { EnabledFeatures } from 'reviewboard/common'; -import { PageView, PageViewOptions } from 'reviewboard/common/views/pageView'; -import { UserSession } from 'reviewboard/common/models/userSessionModel'; +import { + EnabledFeatures, + PageView, + UserSession, +} from 'reviewboard/common'; +import { PageViewOptions } from 'reviewboard/common/views/pageView'; +import { DnDUploader } from 'reviewboard/ui'; -import { ReviewDialogView } from './reviewDialogView'; import { ReviewRequestEditor } from '../models/reviewRequestEditorModel'; -import { ReviewRequestEditorView } from './reviewRequestEditorView'; import { ReviewablePage } from '../models/reviewablePageModel'; import { UnifiedBanner } from '../models/unifiedBannerModel'; +import { ReviewDialogView } from './reviewDialogView'; +import { ReviewRequestEditorView } from './reviewRequestEditorView'; import { UnifiedBannerView } from './unifiedBannerView'; diff --git a/reviewboard/static/rb/js/reviews/views/tests/commentDialogViewTests.ts b/reviewboard/static/rb/js/reviews/views/tests/commentDialogViewTests.ts index 7d1fa30f996703dfcafc2d5138db717cb90aea18..089e31a29573d8c1f889160e1efc38258cb7beb1 100644 --- a/reviewboard/static/rb/js/reviews/views/tests/commentDialogViewTests.ts +++ b/reviewboard/static/rb/js/reviews/views/tests/commentDialogViewTests.ts @@ -8,14 +8,12 @@ import { suite, } from 'jasmine-core'; -import { - CommentDialogView, -} from 'reviewboard/reviews/views/commentDialogView'; +import { UserSession } from 'reviewboard/common'; import { CommentEditor, -} from 'reviewboard/reviews/models/commentEditorModel'; -import { DnDUploader } from 'reviewboard/ui/views/dndUploaderView'; -import { UserSession } from 'reviewboard/common/models/userSessionModel'; + CommentDialogView, +} from 'reviewboard/reviews'; +import { DnDUploader } from 'reviewboard/ui'; import { ReviewRequestEditor } from '../../models/reviewRequestEditorModel'; diff --git a/reviewboard/static/rb/js/reviews/views/tests/diffViewerPageViewTests.ts b/reviewboard/static/rb/js/reviews/views/tests/diffViewerPageViewTests.ts index f83eaca5b179568725dfef3fa2451e4c5b582e20..b894494d47971d6f1effcee48b2c193bc2a8c96a 100644 --- a/reviewboard/static/rb/js/reviews/views/tests/diffViewerPageViewTests.ts +++ b/reviewboard/static/rb/js/reviews/views/tests/diffViewerPageViewTests.ts @@ -8,18 +8,15 @@ import { suite, } from 'jasmine-core'; -import { DnDUploader } from 'reviewboard/ui/views/dndUploaderView'; import { - DiffViewerPage, -} from 'reviewboard/reviews/models/diffViewerPageModel'; -import { - DiffViewerPageView, -} from 'reviewboard/reviews/views/diffViewerPageView'; -import { EnabledFeatures } from 'reviewboard/common'; -import { - UnifiedBannerView, -} from 'reviewboard/reviews/views/unifiedBannerView'; -import { UserSession } from 'reviewboard/common/models/userSessionModel'; + EnabledFeatures, + UserSession, +} from 'reviewboard/common'; +import { DnDUploader } from 'reviewboard/ui'; + +import { DiffViewerPage } from '../../models/diffViewerPageModel'; +import { DiffViewerPageView } from '../diffViewerPageView'; +import { UnifiedBannerView } from '../unifiedBannerView'; suite('rb/pages/views/DiffViewerPageView', function() { diff --git a/reviewboard/static/rb/js/reviews/views/tests/reviewDialogViewTests.ts b/reviewboard/static/rb/js/reviews/views/tests/reviewDialogViewTests.ts index d41046dcb700892ae5e9a169193f38f2e97934c8..e72832a21b4066f48e17cc93128a034f9e002582 100644 --- a/reviewboard/static/rb/js/reviews/views/tests/reviewDialogViewTests.ts +++ b/reviewboard/static/rb/js/reviews/views/tests/reviewDialogViewTests.ts @@ -8,13 +8,15 @@ import { spyOn, } from 'jasmine-core'; -import { EnabledFeatures } from 'reviewboard/common'; -import { DnDUploader } from 'reviewboard/ui/views/dndUploaderView'; -import { Review } from 'reviewboard/common/resources/models/reviewModel'; -import { UserSession } from 'reviewboard/common/models/userSessionModel'; +import { + EnabledFeatures, + Review, + UserSession, +} from 'reviewboard/common'; +import { DnDUploader } from 'reviewboard/ui'; -import { ReviewDialogView } from '../reviewDialogView'; import { ReviewRequestEditor } from '../../models/reviewRequestEditorModel'; +import { ReviewDialogView } from '../reviewDialogView'; declare const $testsScratch: JQuery; diff --git a/reviewboard/static/rb/js/reviews/views/tests/reviewRequestEditorViewTests.ts b/reviewboard/static/rb/js/reviews/views/tests/reviewRequestEditorViewTests.ts index 8539696c3bb2f9bc7ce155ecfa6c0c18f9d2a296..2a8548218a53d833b1096143519f20c60fcab756 100644 --- a/reviewboard/static/rb/js/reviews/views/tests/reviewRequestEditorViewTests.ts +++ b/reviewboard/static/rb/js/reviews/views/tests/reviewRequestEditorViewTests.ts @@ -9,14 +9,14 @@ import { suite, } from 'jasmine-core'; -import { DnDUploader } from 'reviewboard/ui/views/dndUploaderView'; import { EnabledFeatures } from 'reviewboard/common'; +import { DnDUploader } from 'reviewboard/ui'; import { ReviewRequestEditor } from '../../models/reviewRequestEditorModel'; -import { ReviewRequestEditorView } from '../reviewRequestEditorView'; import { UnifiedBanner } from '../../models/unifiedBannerModel'; -import { UnifiedBannerView } from '../unifiedBannerView'; +import { ReviewRequestEditorView } from '../reviewRequestEditorView'; import * as ReviewRequestFields from '../reviewRequestFieldViews'; +import { UnifiedBannerView } from '../unifiedBannerView'; declare const $testsScratch: JQuery; declare const dedent: (string) => string; diff --git a/reviewboard/static/rb/js/reviews/views/tests/reviewablePageViewTests.ts b/reviewboard/static/rb/js/reviews/views/tests/reviewablePageViewTests.ts index 40f6bf06026c41c292655db2008745e776d71211..38b8041c51fc6535fee400de014ff573697ff1be 100644 --- a/reviewboard/static/rb/js/reviews/views/tests/reviewablePageViewTests.ts +++ b/reviewboard/static/rb/js/reviews/views/tests/reviewablePageViewTests.ts @@ -9,11 +9,11 @@ import { suite, } from 'jasmine-core'; -import { DnDUploader } from 'reviewboard/ui/views/dndUploaderView'; import { EnabledFeatures } from 'reviewboard/common'; +import { DnDUploader } from 'reviewboard/ui'; -import { ReviewDialogView } from '../reviewDialogView'; import { ReviewablePage } from '../../models/reviewablePageModel'; +import { ReviewDialogView } from '../reviewDialogView'; import { ReviewablePageView } from '../reviewablePageView'; import { UnifiedBannerView } from '../unifiedBannerView'; diff --git a/reviewboard/static/rb/js/reviews/views/unifiedBannerView.ts b/reviewboard/static/rb/js/reviews/views/unifiedBannerView.ts index 0f8e6b10c5361be539cfd8c807384cd545c3e578..ecdfe1a61dbe03d21b72e51c789c822bd9982720 100644 --- a/reviewboard/static/rb/js/reviews/views/unifiedBannerView.ts +++ b/reviewboard/static/rb/js/reviews/views/unifiedBannerView.ts @@ -3,15 +3,20 @@ */ import { BaseView, EventsHash, spina } from '@beanbag/spina'; -import { ClientCommChannel } from 'reviewboard/common/models/commChannelModel'; -import { FloatingBannerView } from 'reviewboard/ui/views/floatingBannerView'; -import { MenuButtonView } from 'reviewboard/ui/views/menuButtonView'; -import { MenuType, MenuView } from 'reviewboard/ui/views/menuView'; -import { UserSession } from 'reviewboard/common/models/userSessionModel'; +import { + ClientCommChannel, + UserSession, +} from 'reviewboard/common'; +import { + FloatingBannerView, + MenuButtonView, + MenuView, +} from 'reviewboard/ui'; +import { MenuType } from 'reviewboard/ui/views/menuView'; import { DraftMode, UnifiedBanner } from '../models/unifiedBannerModel'; -import { ChangeDescriptionFieldView } from './reviewRequestFieldViews'; import { ReviewRequestEditorView } from './reviewRequestEditorView'; +import { ChangeDescriptionFieldView } from './reviewRequestFieldViews'; declare const dedent: (string, ...args) => string; diff --git a/reviewboard/static/rb/js/ui/views/tests/textEditorViewTests.ts b/reviewboard/static/rb/js/ui/views/tests/textEditorViewTests.ts index a8b7f8f8b420ad3ee3bc92ad544403629fb03ea2..92411f8ee3f96507b853fcf359c16ae80c18e669 100644 --- a/reviewboard/static/rb/js/ui/views/tests/textEditorViewTests.ts +++ b/reviewboard/static/rb/js/ui/views/tests/textEditorViewTests.ts @@ -8,7 +8,7 @@ import { suite, } from 'jasmine-core'; -import { UserSession } from 'reviewboard/common/models/userSessionModel'; +import { UserSession } from 'reviewboard/common'; import { DnDUploader } from '../dndUploaderView'; import { TextEditorView } from '../textEditorView'; diff --git a/reviewboard/static/rb/js/ui/views/textEditorView.ts b/reviewboard/static/rb/js/ui/views/textEditorView.ts index e1eb1da76fd0e1cefc6016b361514034553c8530..9fe074bb5f9a72bb26796c493056f32a40b5b5e5 100644 --- a/reviewboard/static/rb/js/ui/views/textEditorView.ts +++ b/reviewboard/static/rb/js/ui/views/textEditorView.ts @@ -1,7 +1,7 @@ import { BaseView, EventsHash, spina } from '@beanbag/spina'; import CodeMirror from 'codemirror'; -import { UserSession } from 'reviewboard/common/models/userSessionModel'; +import { UserSession } from 'reviewboard/common'; import { DnDUploader } from './dndUploaderView';