From fb438ac52c15b7378b5c64d5ad0202689a1705ba Mon Sep 17 00:00:00 2001 From: Chen-I Lim Date: Tue, 20 Oct 2020 18:54:39 -0700 Subject: [PATCH] reorganize viewModel folder --- webapp/src/archiver.ts | 2 +- webapp/src/components/boardComponent.tsx | 2 +- webapp/src/components/cardDetail.tsx | 4 ++-- webapp/src/components/cardDialog.tsx | 2 +- webapp/src/components/filterComponent.tsx | 2 +- webapp/src/components/sidebar.tsx | 4 ++-- webapp/src/components/tableComponent.tsx | 2 +- webapp/src/components/tableRow.tsx | 2 +- webapp/src/components/viewMenu.tsx | 2 +- webapp/src/components/workspaceComponent.tsx | 4 ++-- webapp/src/csvExporter.ts | 2 +- webapp/src/mutator.ts | 2 +- webapp/src/octoUtils.tsx | 14 +++++++------- webapp/src/pages/boardPage.tsx | 5 ++--- webapp/src/{ => viewModel}/boardTree.ts | 17 ++++++++--------- webapp/src/{ => viewModel}/cardTree.ts | 10 +++++----- webapp/src/{ => viewModel}/workspaceTree.ts | 8 ++++---- 17 files changed, 41 insertions(+), 43 deletions(-) rename webapp/src/{ => viewModel}/boardTree.ts (96%) rename webapp/src/{ => viewModel}/cardTree.ts (82%) rename webapp/src/{ => viewModel}/workspaceTree.ts (79%) diff --git a/webapp/src/archiver.ts b/webapp/src/archiver.ts index 5f95c3462..19523e677 100644 --- a/webapp/src/archiver.ts +++ b/webapp/src/archiver.ts @@ -1,6 +1,6 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {BoardTree} from './boardTree' +import {BoardTree} from './viewModel/boardTree' import mutator from './mutator' import {IBlock} from './octoTypes' import {Utils} from './utils' diff --git a/webapp/src/components/boardComponent.tsx b/webapp/src/components/boardComponent.tsx index 7d5d5a007..1df3690cc 100644 --- a/webapp/src/components/boardComponent.tsx +++ b/webapp/src/components/boardComponent.tsx @@ -6,7 +6,7 @@ import {Archiver} from '../archiver' import {BlockIcons} from '../blockIcons' import {IPropertyOption} from '../blocks/board' import {Card, MutableCard} from '../blocks/card' -import {BoardTree} from '../boardTree' +import {BoardTree} from '../viewModel/boardTree' import {CardFilter} from '../cardFilter' import ViewMenu from '../components/viewMenu' import {Constants} from '../constants' diff --git a/webapp/src/components/cardDetail.tsx b/webapp/src/components/cardDetail.tsx index a801ba8e4..b576b95e5 100644 --- a/webapp/src/components/cardDetail.tsx +++ b/webapp/src/components/cardDetail.tsx @@ -5,8 +5,8 @@ import { BlockIcons } from '../blockIcons' import { MutableCommentBlock } from '../blocks/commentBlock' import { IOrderedBlock } from '../blocks/orderedBlock' import { MutableTextBlock } from '../blocks/textBlock' -import { BoardTree } from '../boardTree' -import { CardTree, MutableCardTree } from '../cardTree' +import { BoardTree } from '../viewModel/boardTree' +import { CardTree, MutableCardTree } from '../viewModel/cardTree' import { Menu as OldMenu, MenuOption } from '../menu' import mutator from '../mutator' import { OctoListener } from '../octoListener' diff --git a/webapp/src/components/cardDialog.tsx b/webapp/src/components/cardDialog.tsx index 870bb7be9..734a56824 100644 --- a/webapp/src/components/cardDialog.tsx +++ b/webapp/src/components/cardDialog.tsx @@ -3,7 +3,7 @@ import React from 'react' import {Card} from '../blocks/card' -import {BoardTree} from '../boardTree' +import {BoardTree} from '../viewModel/boardTree' import mutator from '../mutator' import Menu from '../widgets/menu' diff --git a/webapp/src/components/filterComponent.tsx b/webapp/src/components/filterComponent.tsx index 16f889449..49c992e6e 100644 --- a/webapp/src/components/filterComponent.tsx +++ b/webapp/src/components/filterComponent.tsx @@ -2,7 +2,7 @@ // See LICENSE.txt for license information. import React from 'react' -import {BoardTree} from '../boardTree' +import {BoardTree} from '../viewModel/boardTree' import {FilterClause, FilterCondition} from '../filterClause' import {FilterGroup} from '../filterGroup' import {Menu} from '../menu' diff --git a/webapp/src/components/sidebar.tsx b/webapp/src/components/sidebar.tsx index 4a77fb6bc..a00597af0 100644 --- a/webapp/src/components/sidebar.tsx +++ b/webapp/src/components/sidebar.tsx @@ -3,11 +3,11 @@ import React from 'react' import { Archiver } from '../archiver' import { Board, MutableBoard } from '../blocks/board' -import { BoardTree } from '../boardTree' +import { BoardTree } from '../viewModel/boardTree' import mutator from '../mutator' import Menu from '../widgets/menu' import MenuWrapper from '../widgets/menuWrapper' -import { WorkspaceTree } from '../workspaceTree' +import { WorkspaceTree } from '../viewModel/workspaceTree' type Props = { diff --git a/webapp/src/components/tableComponent.tsx b/webapp/src/components/tableComponent.tsx index 4cdbfd99a..185925d9e 100644 --- a/webapp/src/components/tableComponent.tsx +++ b/webapp/src/components/tableComponent.tsx @@ -6,7 +6,7 @@ import {Archiver} from '../archiver' import {BlockIcons} from '../blockIcons' import {IPropertyTemplate} from '../blocks/board' import {Card, MutableCard} from '../blocks/card' -import {BoardTree} from '../boardTree' +import {BoardTree} from '../viewModel/boardTree' import ViewMenu from '../components/viewMenu' import {CsvExporter} from '../csvExporter' import {Menu as OldMenu} from '../menu' diff --git a/webapp/src/components/tableRow.tsx b/webapp/src/components/tableRow.tsx index 7e7090755..cd1b1dab2 100644 --- a/webapp/src/components/tableRow.tsx +++ b/webapp/src/components/tableRow.tsx @@ -2,7 +2,7 @@ // See LICENSE.txt for license information. import React from 'react' -import {BoardTree} from '../boardTree' +import {BoardTree} from '../viewModel/boardTree' import {Card} from '../blocks/card' import mutator from '../mutator' import {OctoUtils} from '../octoUtils' diff --git a/webapp/src/components/viewMenu.tsx b/webapp/src/components/viewMenu.tsx index b58e7aaf0..701c0c236 100644 --- a/webapp/src/components/viewMenu.tsx +++ b/webapp/src/components/viewMenu.tsx @@ -4,7 +4,7 @@ import React from 'react' import {Board} from '../blocks/board' import {BoardView, MutableBoardView} from '../blocks/boardView' -import {BoardTree} from '../boardTree' +import {BoardTree} from '../viewModel/boardTree' import mutator from '../mutator' import {Utils} from '../utils' import Menu from '../widgets/menu' diff --git a/webapp/src/components/workspaceComponent.tsx b/webapp/src/components/workspaceComponent.tsx index fb52d8e93..06383fe43 100644 --- a/webapp/src/components/workspaceComponent.tsx +++ b/webapp/src/components/workspaceComponent.tsx @@ -2,9 +2,9 @@ // See LICENSE.txt for license information. import React from 'react' -import {BoardTree} from '../boardTree' +import {BoardTree} from '../viewModel/boardTree' import {Utils} from '../utils' -import {WorkspaceTree} from '../workspaceTree' +import {WorkspaceTree} from '../viewModel/workspaceTree' import {BoardComponent} from './boardComponent' import {Sidebar} from './sidebar' diff --git a/webapp/src/csvExporter.ts b/webapp/src/csvExporter.ts index e74378aaf..48fafd5ce 100644 --- a/webapp/src/csvExporter.ts +++ b/webapp/src/csvExporter.ts @@ -1,7 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. import {BoardView} from './blocks/boardView' -import {BoardTree} from './boardTree' +import {BoardTree} from './viewModel/boardTree' import {OctoUtils} from './octoUtils' import {Utils} from './utils' diff --git a/webapp/src/mutator.ts b/webapp/src/mutator.ts index 742fe0f07..6f61358fb 100644 --- a/webapp/src/mutator.ts +++ b/webapp/src/mutator.ts @@ -6,7 +6,7 @@ import {BoardView, ISortOption, MutableBoardView} from './blocks/boardView' import {Card, MutableCard} from './blocks/card' import {MutableImageBlock} from './blocks/imageBlock' import {IOrderedBlock, MutableOrderedBlock} from './blocks/orderedBlock' -import {BoardTree} from './boardTree' +import {BoardTree} from './viewModel/boardTree' import {FilterGroup} from './filterGroup' import octoClient from './octoClient' import {IBlock} from './octoTypes' diff --git a/webapp/src/octoUtils.tsx b/webapp/src/octoUtils.tsx index af3c29741..d7a465214 100644 --- a/webapp/src/octoUtils.tsx +++ b/webapp/src/octoUtils.tsx @@ -3,14 +3,14 @@ import React from 'react' import {MutableBlock} from './blocks/block' -import {Board, IPropertyTemplate, MutableBoard} from './blocks/board' -import {BoardView, ISortOption, MutableBoardView} from './blocks/boardView' +import {IPropertyTemplate, MutableBoard} from './blocks/board' +import {ISortOption, MutableBoardView} from './blocks/boardView' import {Card, MutableCard} from './blocks/card' -import {CommentBlock, MutableCommentBlock} from './blocks/commentBlock' -import {ImageBlock, MutableImageBlock} from './blocks/imageBlock' -import { IOrderedBlock } from './blocks/orderedBlock' -import {MutableTextBlock, TextBlock} from './blocks/textBlock' -import {BoardTree} from './boardTree' +import {MutableCommentBlock} from './blocks/commentBlock' +import {MutableImageBlock} from './blocks/imageBlock' +import {IOrderedBlock} from './blocks/orderedBlock' +import {MutableTextBlock} from './blocks/textBlock' +import {BoardTree} from './viewModel/boardTree' import {Editable} from './components/editable' import {Menu} from './menu' import mutator from './mutator' diff --git a/webapp/src/pages/boardPage.tsx b/webapp/src/pages/boardPage.tsx index 4a82bf0fb..ff6c79e4b 100644 --- a/webapp/src/pages/boardPage.tsx +++ b/webapp/src/pages/boardPage.tsx @@ -4,15 +4,14 @@ import React from 'react' import ReactDOM from 'react-dom' import {BoardView} from '../blocks/boardView' -import {BoardTree, MutableBoardTree} from '../boardTree' -import {CardTree} from '../cardTree' +import {MutableBoardTree} from '../viewModel/boardTree' import {FilterComponent} from '../components/filterComponent' import {WorkspaceComponent} from '../components/workspaceComponent' import {FlashMessage} from '../flashMessage' import mutator from '../mutator' import {OctoListener} from '../octoListener' import {Utils} from '../utils' -import {MutableWorkspaceTree, WorkspaceTree} from '../workspaceTree' +import {MutableWorkspaceTree} from '../viewModel/workspaceTree' type Props = { } diff --git a/webapp/src/boardTree.ts b/webapp/src/viewModel/boardTree.ts similarity index 96% rename from webapp/src/boardTree.ts rename to webapp/src/viewModel/boardTree.ts index d109bd444..937f0f4e8 100644 --- a/webapp/src/boardTree.ts +++ b/webapp/src/viewModel/boardTree.ts @@ -1,14 +1,13 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {MutableBlock} from './blocks/block' -import {Board, IPropertyOption, IPropertyTemplate, MutableBoard} from './blocks/board' -import {BoardView, MutableBoardView} from './blocks/boardView' -import {Card} from './blocks/card' -import {CardFilter} from './cardFilter' -import octoClient from './octoClient' -import {IBlock} from './octoTypes' -import {OctoUtils} from './octoUtils' -import {Utils} from './utils' +import {Board, IPropertyOption, IPropertyTemplate, MutableBoard} from '../blocks/board' +import {BoardView, MutableBoardView} from '../blocks/boardView' +import {Card} from '../blocks/card' +import {CardFilter} from '../cardFilter' +import octoClient from '../octoClient' +import {IBlock} from '../octoTypes' +import {OctoUtils} from '../octoUtils' +import {Utils} from '../utils' type Group = { option: IPropertyOption, cards: Card[] } diff --git a/webapp/src/cardTree.ts b/webapp/src/viewModel/cardTree.ts similarity index 82% rename from webapp/src/cardTree.ts rename to webapp/src/viewModel/cardTree.ts index edd39e281..4c14be578 100644 --- a/webapp/src/cardTree.ts +++ b/webapp/src/viewModel/cardTree.ts @@ -1,10 +1,10 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {Card} from './blocks/card' -import { IOrderedBlock } from './blocks/orderedBlock' -import octoClient from './octoClient' -import {IBlock} from './octoTypes' -import {OctoUtils} from './octoUtils' +import {Card} from '../blocks/card' +import { IOrderedBlock } from '../blocks/orderedBlock' +import octoClient from '../octoClient' +import {IBlock} from '../octoTypes' +import {OctoUtils} from '../octoUtils' interface CardTree { readonly card: Card diff --git a/webapp/src/workspaceTree.ts b/webapp/src/viewModel/workspaceTree.ts similarity index 79% rename from webapp/src/workspaceTree.ts rename to webapp/src/viewModel/workspaceTree.ts index 9bcb2fb62..202f5b4eb 100644 --- a/webapp/src/workspaceTree.ts +++ b/webapp/src/viewModel/workspaceTree.ts @@ -1,9 +1,9 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {Board} from './blocks/board' -import octoClient from './octoClient' -import { IBlock } from './octoTypes' -import {OctoUtils} from './octoUtils' +import {Board} from '../blocks/board' +import octoClient from '../octoClient' +import { IBlock } from '../octoTypes' +import {OctoUtils} from '../octoUtils' interface WorkspaceTree { readonly boards: readonly Board[]