rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: show toast when duplicating note and update last modified date for duplicated note (#2379)

Browse Source
This commit is contained in:
Aman Harwara
2023-08-01 18:23:20 +05:30
committed by GitHub
parent 45265fcbad
commit b58898687e
11 changed files with 67 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/web/src/javascripts/Components/ApplicationView/ApplicationView.tsx
View File

@@ -261,6 +261,7 @@ const ApplicationView: FunctionComponent<Props> = ({ application, mainApplicatio
notesController={viewControllerManager.notesController}
linkingController={viewControllerManager.linkingController}
historyModalController={viewControllerManager.historyModalController}
selectionController={viewControllerManager.selectionController}
/>
<TagContextMenuWrapper
navigationController={viewControllerManager.navigationController}

1
packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx
View File

@@ -381,6 +381,7 @@ const ContentListView = forwardRef<HTMLDivElement, Props>(
notesController={notesController}
historyModalController={historyModalController}
itemListController={itemListController}
selectionController={selectionController}
/>
) : (
<ContentList

9
packages/web/src/javascripts/Components/ContentTableView/ContentTableView.tsx
View File

@@ -41,6 +41,7 @@ import { useItemLinks } from '@/Hooks/useItemLinks'
import { ItemLink } from '@/Utils/Items/Search/ItemLink'
import { ItemListController } from '@/Controllers/ItemList/ItemListController'
import ListItemVaultInfo from '../ContentListView/ListItemVaultInfo'
import { SelectedItemsController } from '@/Controllers/SelectedItemsController'
const ContextMenuCell = ({
items,
@@ -49,6 +50,7 @@ const ContextMenuCell = ({
linkingController,
notesController,
historyModalController,
selectionController,
}: {
items: DecryptedItemInterface[]
filesController: FilesController
@@ -56,6 +58,7 @@ const ContextMenuCell = ({
linkingController: LinkingController
notesController: NotesController
historyModalController: HistoryModalController
selectionController: SelectedItemsController
}) => {
const [contextMenuVisible, setContextMenuVisible] = useState(false)
const anchorElementRef = useRef<HTMLButtonElement>(null)
@@ -117,6 +120,7 @@ const ContextMenuCell = ({
notesController={notesController}
linkingController={linkingController}
historyModalController={historyModalController}
selectionController={selectionController}
closeMenu={() => {
setContextMenuVisible(false)
}}
@@ -266,6 +270,7 @@ type Props = {
notesController: NotesController
historyModalController: HistoryModalController
itemListController: ItemListController
selectionController: SelectedItemsController
}
const ContentTableView = ({
@@ -278,6 +283,7 @@ const ContentTableView = ({
notesController,
historyModalController,
itemListController,
selectionController,
}: Props) => {
const listHasFiles = items.some((item) => item instanceof FileItem)
@@ -406,6 +412,7 @@ const ContentTableView = ({
navigationController={navigationController}
notesController={notesController}
historyModalController={historyModalController}
selectionController={selectionController}
/>
</div>
)
@@ -418,6 +425,7 @@ const ContentTableView = ({
navigationController={navigationController}
notesController={notesController}
historyModalController={historyModalController}
selectionController={selectionController}
/>
),
showSelectionActions: true,
@@ -465,6 +473,7 @@ const ContentTableView = ({
notesController={notesController}
linkingController={linkingController}
historyModalController={historyModalController}
selectionController={selectionController}
closeMenu={closeContextMenu}
/>
</Menu>

1
packages/web/src/javascripts/Components/MultipleSelectedNotes/MultipleSelectedNotes.tsx
View File

@@ -51,6 +51,7 @@ const MultipleSelectedNotes = ({
notesController={notesController}
linkingController={linkingController}
historyModalController={historyModalController}
selectionController={selectionController}
/>
</div>
</div>

1
packages/web/src/javascripts/Components/NoteView/NoteView.tsx
View File

@@ -932,6 +932,7 @@ class NoteView extends AbstractComponent<NoteViewProps, State> {
notesController={this.viewControllerManager.notesController}
linkingController={this.viewControllerManager.linkingController}
historyModalController={this.viewControllerManager.historyModalController}
selectionController={this.viewControllerManager.selectionController}
onClickPreprocessing={this.ensureNoteIsInsertedBeforeUIAction}
/>
</div>

4
packages/web/src/javascripts/Components/NotesContextMenu/NotesContextMenu.tsx
View File

@@ -7,12 +7,14 @@ import { HistoryModalController } from '@/Controllers/NoteHistory/HistoryModalCo
import Popover from '../Popover/Popover'
import { LinkingController } from '@/Controllers/LinkingController'
import Menu from '../Menu/Menu'
import { SelectedItemsController } from '@/Controllers/SelectedItemsController'
type Props = {
navigationController: NavigationController
notesController: NotesController
linkingController: LinkingController
historyModalController: HistoryModalController
selectionController: SelectedItemsController
}
const NotesContextMenu = ({
@@ -20,6 +22,7 @@ const NotesContextMenu = ({
notesController,
linkingController,
historyModalController,
selectionController,
}: Props) => {
const { contextMenuOpen, contextMenuClickLocation, setContextMenuOpen } = notesController
@@ -50,6 +53,7 @@ const NotesContextMenu = ({
notesController={notesController}
linkingController={linkingController}
historyModalController={historyModalController}
selectionController={selectionController}
requestDisableClickOutside={handleDisableClickOutsideRequest}
closeMenu={closeMenu}
/>

27
packages/web/src/javascripts/Components/NotesOptions/NotesOptions.tsx
View File

@@ -55,6 +55,7 @@ const NotesOptions = ({
navigationController,
notesController,
linkingController,
selectionController,
historyModalController,
closeMenu,
}: NotesOptionsProps) => {
@@ -150,10 +151,32 @@ const NotesOptions = ({
}, [closeMenu, toggleAppPane])
const duplicateSelectedItems = useCallback(async () => {
await Promise.all(notes.map((note) => application.mutator.duplicateItem(note).catch(console.error)))
await Promise.all(
notes.map((note) =>
application.mutator
.duplicateItem(note)
.then((duplicated) =>
addToast({
type: ToastType.Regular,
message: `Duplicated note "${duplicated.title}"`,
actions: [
{
label: 'Open',
handler: (toastId) => {
selectionController.selectItem(duplicated.uuid, true).catch(console.error)
dismissToast(toastId)
},
},
],
autoClose: true,
}),
)
.catch(console.error),
),
)
void application.sync.sync()
closeMenuAndToggleNotesList()
}, [application.mutator, application.sync, closeMenuAndToggleNotesList, notes])
}, [application.mutator, application.sync, closeMenuAndToggleNotesList, notes, selectionController])
const openRevisionHistoryModal = useCallback(() => {
historyModalController.openModal(notesController.firstSelectedNote)

4
packages/web/src/javascripts/Components/NotesOptions/NotesOptionsPanel.tsx
View File

@@ -8,12 +8,14 @@ import Popover from '../Popover/Popover'
import { LinkingController } from '@/Controllers/LinkingController'
import RoundIconButton from '../Button/RoundIconButton'
import Menu from '../Menu/Menu'
import { SelectedItemsController } from '@/Controllers/SelectedItemsController'
type Props = {
navigationController: NavigationController
notesController: NotesController
linkingController: LinkingController
historyModalController: HistoryModalController
selectionController: SelectedItemsController
onClickPreprocessing?: () => Promise<void>
}
@@ -22,6 +24,7 @@ const NotesOptionsPanel = ({
notesController,
linkingController,
historyModalController,
selectionController,
onClickPreprocessing,
}: Props) => {
const [isOpen, setIsOpen] = useState(false)
@@ -58,6 +61,7 @@ const NotesOptionsPanel = ({
notesController={notesController}
linkingController={linkingController}
historyModalController={historyModalController}
selectionController={selectionController}
requestDisableClickOutside={handleDisableClickOutsideRequest}
closeMenu={toggleMenu}
/>

2
packages/web/src/javascripts/Components/NotesOptions/NotesOptionsProps.ts
View File

@@ -3,6 +3,7 @@ import { NavigationController } from '@/Controllers/Navigation/NavigationControl
import { NotesController } from '@/Controllers/NotesController/NotesController'
import { LinkingController } from '@/Controllers/LinkingController'
import { SNNote } from '@standardnotes/snjs'
import { SelectedItemsController } from '@/Controllers/SelectedItemsController'
export type NotesOptionsProps = {
notes: SNNote[]
@@ -10,6 +11,7 @@ export type NotesOptionsProps = {
notesController: NotesController
linkingController: LinkingController
historyModalController: HistoryModalController
selectionController: SelectedItemsController
requestDisableClickOutside?: (disabled: boolean) => void
closeMenu: () => void
}