Skip to content

Commit

Permalink
[desk-tool] Refactor file organization
Browse files Browse the repository at this point in the history
  • Loading branch information
mariuslundgard committed Apr 21, 2020
1 parent 7d748fb commit 591c3da
Show file tree
Hide file tree
Showing 98 changed files with 154 additions and 216 deletions.
10 changes: 5 additions & 5 deletions packages/@sanity/desk-tool/sanity.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,25 @@
"parts": [
{
"implements": "part:@sanity/base/tool",
"path": "tool.js"
"path": "tool/index.js"
},
{
"implements": "part:@sanity/base/document-actions",
"description": "The default document actions",
"path": "defaultDocumentActions.js"
"path": "actions/defaultDocumentActions.js"
},
{
"implements": "part:@sanity/base/document-actions/resolver",
"path": "defaultResolveDocumentActions.js"
"path": "actions/defaultResolveDocumentActions.js"
},
{
"implements": "part:@sanity/base/document-badges",
"description": "The default document badges",
"path": "defaultDocumentBadges.js"
"path": "badges/defaultDocumentBadges.js"
},
{
"implements": "part:@sanity/base/document-badges/resolver",
"path": "defaultResolveDocumentBadges.js"
"path": "badges/defaultResolveDocumentBadges.js"
},
{
"name": "part:@sanity/desk-tool/after-editor-component",
Expand Down
15 changes: 15 additions & 0 deletions packages/@sanity/desk-tool/src/actions/defaultDocumentActions.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import {PublishAction} from './PublishAction'
import {DiscardChangesAction} from './DiscardChangesAction'
import {UnpublishAction} from './UnpublishAction'
import {DuplicateAction} from './DuplicateAction'
import {DeleteAction} from './DeleteAction'

export {PublishAction}
export {DiscardChangesAction}
export {UnpublishAction}
export {DuplicateAction}
export {DeleteAction}

export default function defaultResolveDocumentActions(props) {
return [PublishAction, DiscardChangesAction, UnpublishAction, DuplicateAction, DeleteAction]
}
15 changes: 15 additions & 0 deletions packages/@sanity/desk-tool/src/badges/defaultDocumentBadges.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import {LiveEditBadge} from './LiveEditBadge'
import {PublishedStatusBadge} from './PublishedStatusBadge'
import {DraftStatusBadge} from './DraftStatusBadge'

import schema from 'part:@sanity/base/schema'

export {PublishedStatusBadge} from './PublishedStatusBadge'
export {DraftStatusBadge} from './DraftStatusBadge'
export {LiveEditBadge} from './LiveEditBadge'

export default function defaultResolveDocumentBadges(props) {
const schemaType = schema.get(props.type)
const isLiveEditEnabled = schemaType.liveEdit === true
return isLiveEditEnabled ? [LiveEditBadge] : [PublishedStatusBadge, DraftStatusBadge]
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {observePaths} from 'part:@sanity/base/preview'
import {getDraftId, getPublishedId} from 'part:@sanity/base/util/draft-utils'
import FormBuilder from 'part:@sanity/form-builder'
import PanePopover from 'part:@sanity/components/dialogs/pane-popover'
import styles from './styles/BrokenReferences.css'
import styles from './BrokenReferences.css'
import ReferringDocumentsList from './ReferringDocumentsList'

function BrokenRefs(props) {
Expand Down
2 changes: 1 addition & 1 deletion packages/@sanity/desk-tool/src/components/Diff.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import PropTypes from 'prop-types'
import React from 'react'
import {diffJson} from 'diff'
import styles from './styles/Diff.css'
import styles from './Diff.css'

function getDiffStatKey(part) {
if (part.added) {
Expand Down
2 changes: 1 addition & 1 deletion packages/@sanity/desk-tool/src/components/DraftStatus.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import {Tooltip} from 'react-tippy'
import styles from './styles/ItemStatus.css'
import styles from './ItemStatus.css'
import Badge from 'part:@sanity/components/badges/default'

const DraftStatus = () => (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import styles from './styles/GetStarted.css'
import styles from './GetStarted.css'

const GetStarted = () => {
return (
Expand All @@ -17,7 +17,8 @@ const GetStarted = () => {
rel="noopener noreferrer"
>
creating schemas
</a>.
</a>
.
</p>
</div>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import client from 'part:@sanity/base/client'
import {useRouter} from 'part:@sanity/base/router'
import Spinner from 'part:@sanity/components/loading/spinner'
import {useStructure} from '../utils/resolvePanes'
import {LOADING_PANE} from '../../'
import {LOADING_PANE} from '../constants'
import StructureError from './StructureError'
import UUID from '@sanity/uuid'
import {getTemplateById} from '@sanity/base/initial-value-templates'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import styles from './styles/MissingDocumentTypesMessage.css'
import styles from './MissingDocumentTypesMessage.css'

export default function MissingDocumentTypesMessage(props) {
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import VisibilityOffIcon from 'part:@sanity/base/visibility-off-icon'
import {Tooltip} from 'react-tippy'
import styles from './styles/ItemStatus.css'
import styles from './ItemStatus.css'

const NotPublishedStatus = () => (
<Tooltip
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {List as DefaultList, Item as DefaultItem} from 'part:@sanity/components/
import Preview from 'part:@sanity/base/preview'
import {IntentLink} from 'part:@sanity/base/router'
import schema from 'part:@sanity/base/schema'
import styles from './styles/ReferringDocumentsList.css'
import styles from './ReferringDocumentsList.css'
import DraftStatus from './DraftStatus'

export default function ReferringDocumentsList(props) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
import generateHelpUrl from '@sanity/generate-help-url'
import {SerializeError} from '@sanity/structure'
import ErrorIcon from 'part:@sanity/base/error-icon'
import styles from './styles/StructureError.css'
import styles from './StructureError.css'

function formatStack(stack) {
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import PropTypes from 'prop-types'
import React from 'react'
import {List as GridList} from 'part:@sanity/components/lists/grid'
import styles from './styles/ListView.css'
import styles from './ListView.css'

export default class ListView extends React.PureComponent {
static propTypes = {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export {default as ListView} from './ListView'
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import schema from 'part:@sanity/base/schema'
import {SanityDefaultPreview} from 'part:@sanity/base/preview'
import folderIcon from 'part:@sanity/base/folder-icon'
import fileIcon from 'part:@sanity/base/file-icon'
import DocumentPaneItemPreview from '../components/DocumentPaneItemPreview'
import getIconWithFallback from '../utils/getIconWithFallback'
import MissingSchemaType from '../components/MissingSchemaType'
import DocumentPaneItemPreview from '../../components/DocumentPaneItemPreview'
import getIconWithFallback from '../../utils/getIconWithFallback'
import MissingSchemaType from '../../components/MissingSchemaType'
import PaneItemWrapper from './PaneItemWrapper'

export default function PaneItem(props) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import PropTypes from 'prop-types'
import React, {useContext} from 'react'
import {Item as GridListItem} from 'part:@sanity/components/lists/grid'
import {PaneRouterContext} from '../index'
import styles from './styles/PaneItem.css'
import listStyles from './styles/ListView.css'
import {PaneRouterContext} from '../../contexts/PaneRouterContext'
import styles from './PaneItem.css'
import listStyles from '../../components/listView/ListView.css'

const PaneItemWrapper = props => {
const {ChildLink} = useContext(PaneRouterContext)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export {default as PaneItem} from './PaneItem'
2 changes: 2 additions & 0 deletions packages/@sanity/desk-tool/src/constants.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export const LOADING_PANE = Symbol('LOADING_PANE')
export const EMPTY_PARAMS = {}
15 changes: 0 additions & 15 deletions packages/@sanity/desk-tool/src/defaultDocumentActions.ts

This file was deleted.

15 changes: 0 additions & 15 deletions packages/@sanity/desk-tool/src/defaultDocumentBadges.ts

This file was deleted.

2 changes: 2 additions & 0 deletions packages/@sanity/desk-tool/src/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from './constants'
export * from './contexts/PaneRouterContext'
4 changes: 0 additions & 4 deletions packages/@sanity/desk-tool/src/index.ts

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
/* eslint-disable react/jsx-filename-extension */

import React from 'react'
import PropTypes from 'prop-types'
import {noop} from 'lodash'
import DocumentsListPane from './DocumentsListPane'
import UserComponentPane from './UserComponentPane'
import UnknownPaneType from './UnknownPaneType'
import {DocumentPaneProvider} from './DocumentPaneProvider'
import ListPane from './ListPane'
import {DocumentsListPane} from './documentsListPane'
import {UserComponentPane} from './userComponentPane'
import {UnknownPane} from './unknownPane'
import {DocumentPaneProvider} from './documentPane'
import {ListPane} from './listPane'

const paneMap = {
list: ListPane,
Expand Down Expand Up @@ -36,9 +38,9 @@ export default class Pane extends React.PureComponent {

render() {
const {type} = this.props
const ActualPane = paneMap[type] || UnknownPaneType
const PaneComponent = paneMap[type] || UnknownPane
return (
<ActualPane
<PaneComponent
{...this.props}
onExpand={this.handlePaneExpand}
onCollapse={this.handlePaneCollapse}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,24 @@ import historyStore from 'part:@sanity/base/datastore/history'
import TabbedPane from 'part:@sanity/components/panes/tabbed'
import Snackbar from 'part:@sanity/components/snackbar/default'
import {getDraftId, getPublishedId} from 'part:@sanity/base/util/draft-utils'
import UseState from '../utils/UseState'
import InspectView from '../components/InspectView'
import InspectHistory from '../components/InspectHistory'
import {DocumentStatusBar, HistoryStatusBar} from '../components/DocumentStatusBar'
import Delay from '../utils/Delay'
import isNarrowScreen from '../utils/isNarrowScreen'
import windowWidth$ from '../utils/windowWidth'
import UseState from '../../utils/UseState'
import InspectView from './InspectView'
import InspectHistory from './InspectHistory'
import {DocumentStatusBar, HistoryStatusBar} from './DocumentStatusBar'
import Delay from '../../utils/Delay'
import isNarrowScreen from '../../utils/isNarrowScreen'
import windowWidth$ from '../../utils/windowWidth'
import History from './History'
import _documentPaneStyles from './styles/DocumentPane.css'
import _documentPaneStyles from './DocumentPane.css'
import FormView from './Editor/FormView'
import {historyIsEnabled} from './Editor/history'
import {getMenuItems, getProductionPreviewItem} from './documentPaneMenuItems'
import {PaneRouterContext} from '..'
import {DocumentActionShortcuts} from '../components/DocumentActionShortcuts'
import styles from './styles/Editor.css'
import {PaneRouterContext} from '../../contexts/PaneRouterContext'
import {DocumentActionShortcuts} from './DocumentActionShortcuts'
import styles from './Editor.css'
import {Validation} from './Editor/Validation'
import LanguageFilter from 'part:@sanity/desk-tool/language-select-component?'
import {DocumentOperationResults} from '../components/DocumentOperationResults'
import {DocumentOperationResults} from './DocumentOperationResults'

declare const __DEV__: boolean

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react'
import DocumentPane from './DocumentPane'
import withInitialValue from '../utils/withInitialValue'
import withInitialValue from '../../utils/withInitialValue'
import {
useConnectionState,
useDocumentOperation,
Expand Down Expand Up @@ -40,7 +40,7 @@ interface Props {
}
}

export const DocumentPaneProvider = withInitialValue((props: Props) => {
const DocumentPaneProvider = withInitialValue((props: Props) => {
const {patch}: any = useDocumentOperation(props.options.id, props.options.type)
const editState: any = useEditState(props.options.id, props.options.type)
const {markers} = useValidationStatus(props.options.id, props.options.type)
Expand All @@ -66,3 +66,5 @@ export const DocumentPaneProvider = withInitialValue((props: Props) => {
/>
)
})

export default DocumentPaneProvider
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import styles from './DocumentStatusBar.css'
import {DocumentStatusBarActions} from './DocumentStatusBarActions'
import {DocumentStatusBarBadges} from './DocumentStatusBarBadges'
import {SyncState} from './SyncState'
import TimeAgo from '../../components/TimeAgo'
import TimeAgo from '../../../components/TimeAgo'

interface Props {
id: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {ActionMenu} from './ActionMenu'
import {RenderActionCollectionState} from 'part:@sanity/base/actions/utils'
import resolveDocumentActions from 'part:@sanity/base/document-actions/resolver'
import {ActionStateDialog} from './ActionStateDialog'
import {HistoryRestoreAction} from '../../actions/HistoryRestoreAction'
import {HistoryRestoreAction} from '../../../actions/HistoryRestoreAction'

const TOUCH_SUPPORT = 'ontouchstart' in document.documentElement

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import styles from './DocumentStatusBar.css'
import {HistoryStatusBarActions} from './DocumentStatusBarActions'
import TimeAgo from '../../components/TimeAgo'
import TimeAgo from '../../../components/TimeAgo'

interface Props {
id: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react'
import {FormBuilder} from 'part:@sanity/form-builder'
import documentStore from 'part:@sanity/base/datastore/document'

import styles from '../styles/Editor.css'
import styles from '../Editor.css'
import {tap} from 'rxjs/operators'
import {Subscription} from 'rxjs'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Button from 'part:@sanity/components/buttons/default'
import schema from 'part:@sanity/base/schema'
import afterEditorComponents from 'all:part:@sanity/desk-tool/after-editor-component'
import filterFieldFn$ from 'part:@sanity/desk-tool/filter-fields-fn?'
import styles from '../styles/Editor.css'
import styles from '../Editor.css'
import EditForm from './EditForm'
import HistoryForm from './HistoryForm'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import PropTypes from 'prop-types'
import FormBuilder from 'part:@sanity/form-builder'
import styles from '../styles/Editor.css'
import styles from '../Editor.css'

const noop = () => null
const noopPatchChannel = {onPatch: () => noop, receivePatches: noop}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Snackbar from 'part:@sanity/components/snackbar/default'
import Spinner from 'part:@sanity/components/loading/spinner'
import HistoryItem from './HistoryItem'

import styles from './styles/History.css'
import styles from './History.css'

export default class History extends React.PureComponent {
static propTypes = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {from} from 'rxjs'
import HistoryListItem from 'part:@sanity/components/history/list-item'
import historyStore from 'part:@sanity/base/user'
import {format, isYesterday, isToday} from 'date-fns'
import {PaneRouterContext} from '../'
import {PaneRouterContext} from '../../contexts/PaneRouterContext'

const EMPTY_PARAMS = {}
const dateFormat = 'MMM D, YYYY, hh:mm A'
Expand Down

0 comments on commit 591c3da

Please sign in to comment.