From 696cb19757f244798abcb8d51a2f0b8748ab93fe Mon Sep 17 00:00:00 2001 From: Seth Falco Date: Sat, 23 Jul 2022 16:55:55 +0100 Subject: [PATCH 01/24] feat: add opengraph tags to website --- website/site/config.toml | 2 +- website/site/layouts/partials/head.html | 37 +++++++++++++++++++++---- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/website/site/config.toml b/website/site/config.toml index c84b7aeafd3..59eba275247 100644 --- a/website/site/config.toml +++ b/website/site/config.toml @@ -15,7 +15,7 @@ pygmentsStyle = "manni" [params] # Meta author = "" - description = "" + description = "Focalboard is an open source alternative to tools like Asana, Trello, and Notion. Available as a stand-alone application or integrated into the Mattermost platform, Focalboard helps developers stay aligned to complete tasks, reach milestones, and achieve their goals." email = "" ghrepo = "https://github.com/mattermost/focalboard/" diff --git a/website/site/layouts/partials/head.html b/website/site/layouts/partials/head.html index 2dc47c87029..87e09c24d38 100755 --- a/website/site/layouts/partials/head.html +++ b/website/site/layouts/partials/head.html @@ -1,10 +1,37 @@ - {{ .Title }} - {{ with .Site.Params.author }} -{{ end }} {{ with .Site.Params.description }} -{{ end }} {{ with .Site.LanguageCode }} -{{ end }} + +{{ if in .Title "Focalboard" }} +{{ .Title }} +{{ else }} +{{ .Title }} | Focalboard +{{ end }} + + + +{{ with .Site.Params.author }} + +{{ end }} + +{{ with .Site.Params.description }} + + +{{ end }} + +{{ with .Site.LanguageCode }} + + +{{ end }} + + + + + + + + + + {{ if .Params.canonicalUrl }} From 69793bbb85c35a0d459fec1da77cc736ac8b2792 Mon Sep 17 00:00:00 2001 From: Seth Falco Date: Sat, 23 Jul 2022 16:56:29 +0100 Subject: [PATCH 02/24] docs: noteable > notable in contribution guide --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b8e3331f499..6a7bb051b49 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,7 +4,7 @@ Thank you for your interest in contributing! Please read the [Focalboard Contrib When you submit a pull request, it goes through a code review process outlined [here](https://developers.mattermost.com/contribute/getting-started/code-review/). -After a noteable bug fix or improvement is merged, submit a pull request to the [CHANGELOG](CHANGELOG.md) under the next release section. +After a notable bug fix or improvement is merged, submit a pull request to the [CHANGELOG](CHANGELOG.md) under the next release section. ## Bug Reports From ffd8233420f0e3759991ce6626d4f1fdd51f7787 Mon Sep 17 00:00:00 2001 From: Jesus Murguia Date: Thu, 2 Mar 2023 11:45:05 -0700 Subject: [PATCH 03/24] display confirmation if there is any content --- webapp/src/components/cardDialog.tsx | 2 +- webapp/src/components/kanban/kanbanCard.tsx | 9 +++++++-- webapp/src/components/table/tableRow.tsx | 10 +++++++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/webapp/src/components/cardDialog.tsx b/webapp/src/components/cardDialog.tsx index da13e035db2..3d1c5668b22 100644 --- a/webapp/src/components/cardDialog.tsx +++ b/webapp/src/components/cardDialog.tsx @@ -109,7 +109,7 @@ const CardDialog = (props: Props): JSX.Element => { // use may be renaming a card title // and accidently delete the card // so adding des - if (card?.title === '' && card?.fields.contentOrder.length === 0) { + if (card?.title === '' && card?.fields.contentOrder.length === 0 && Object.keys(card?.fields?.properties).length === 0 && attachments?.length === 0 && comments?.length === 0) { handleDeleteCard() return } diff --git a/webapp/src/components/kanban/kanbanCard.tsx b/webapp/src/components/kanban/kanbanCard.tsx index a1fc303e700..3d03f408cd4 100644 --- a/webapp/src/components/kanban/kanbanCard.tsx +++ b/webapp/src/components/kanban/kanbanCard.tsx @@ -20,6 +20,9 @@ import OpenCardTourStep from '../onboardingTour/openCard/open_card' import CopyLinkTourStep from '../onboardingTour/copyLink/copy_link' import CardActionsMenu from '../cardActionsMenu/cardActionsMenu' import CardActionsMenuIcon from '../cardActionsMenu/cardActionsMenuIcon' +import {getCardAttachments} from '../../store/attachments' +import {getCardComments} from '../../store/comments' +import {useAppSelector} from '../../store/hooks' export const OnboardingCardClassName = 'onboardingCard' @@ -38,6 +41,8 @@ type Props = { const KanbanCard = (props: Props) => { const {card, board} = props + const comments = useAppSelector(getCardComments(card?.id)) + const attachments = useAppSelector(getCardAttachments(card?.id)) const intl = useIntl() const [isDragging, isOver, cardRef] = useSortable('card', card, !props.readonly, props.onDrop) const visiblePropertyTemplates = props.visiblePropertyTemplates || [] @@ -72,12 +77,12 @@ const KanbanCard = (props: Props) => { // user trying to delete a card with blank name // but content present cannot be deleted without // confirmation dialog - if (card?.title === '' && card?.fields?.contentOrder?.length === 0) { + if (card?.title === '' && card?.fields?.contentOrder?.length === 0 && Object.keys(card?.fields?.properties).length === 0 && attachments?.length === 0 && comments?.length === 0) { handleDeleteCard() return } setShowConfirmationDialogBox(true) - }, [handleDeleteCard, card.title, card?.fields?.contentOrder?.length]) + }, [handleDeleteCard, card.title, card?.fields?.contentOrder?.length, card?.fields?.properties, attachments?.length, comments?.length]) const handleOnClick = useCallback((e: React.MouseEvent) => { if (props.onClick) { diff --git a/webapp/src/components/table/tableRow.tsx b/webapp/src/components/table/tableRow.tsx index eb570f41c4c..5f9d04da2f9 100644 --- a/webapp/src/components/table/tableRow.tsx +++ b/webapp/src/components/table/tableRow.tsx @@ -10,6 +10,9 @@ import mutator from '../../mutator' import Button from '../../widgets/buttons/button' import Editable from '../../widgets/editable' import {useSortable} from '../../hooks/sortable' +import {useAppSelector} from '../../store/hooks' +import {getCardAttachments} from '../../store/attachments' +import {getCardComments} from '../../store/comments' import {Utils} from '../../utils' @@ -48,7 +51,8 @@ type Props = { const TableRow = (props: Props) => { const intl = useIntl() const {board, card, isManualSort, groupById, visiblePropertyIds, collapsedOptionIds} = props - + const comments = useAppSelector(getCardComments(card?.id)) + const attachments = useAppSelector(getCardAttachments(card?.id)) const titleRef = useRef<{ focus(selectAll?: boolean): void }>(null) const [title, setTitle] = useState(props.card.title || '') const isGrouped = Boolean(groupById) @@ -138,12 +142,12 @@ const TableRow = (props: Props) => { // user trying to delete a card with blank name // but content present cannot be deleted without // confirmation dialog - if (card?.title === '' && card?.fields.contentOrder.length === 0) { + if (card?.title === '' && card?.fields?.contentOrder?.length === 0 && Object.keys(card?.fields?.properties).length === 0 && attachments?.length === 0 && comments?.length === 0) { handleDeleteCard() return } setShowConfirmationDialogBox(true) - }, [card.title, card.fields.contentOrder, handleDeleteCard]) + }, [card.title, card.fields.contentOrder, handleDeleteCard, card?.fields?.properties, attachments?.length, comments?.length]) return (
Date: Thu, 2 Mar 2023 19:46:14 -0700 Subject: [PATCH 04/24] moved isCardEmpty into utils --- webapp/src/components/cardDialog.tsx | 2 +- webapp/src/components/gallery/galleryCard.tsx | 21 ++++++++++++++++++- webapp/src/components/kanban/kanbanCard.tsx | 4 ++-- webapp/src/components/table/tableRow.tsx | 4 ++-- webapp/src/utils.ts | 13 ++++++++++-- 5 files changed, 36 insertions(+), 8 deletions(-) diff --git a/webapp/src/components/cardDialog.tsx b/webapp/src/components/cardDialog.tsx index 3d1c5668b22..64c1e4eb3bf 100644 --- a/webapp/src/components/cardDialog.tsx +++ b/webapp/src/components/cardDialog.tsx @@ -109,7 +109,7 @@ const CardDialog = (props: Props): JSX.Element => { // use may be renaming a card title // and accidently delete the card // so adding des - if (card?.title === '' && card?.fields.contentOrder.length === 0 && Object.keys(card?.fields?.properties).length === 0 && attachments?.length === 0 && comments?.length === 0) { + if (Utils.isCardEmpty(card, comments, attachments)) { handleDeleteCard() return } diff --git a/webapp/src/components/gallery/galleryCard.tsx b/webapp/src/components/gallery/galleryCard.tsx index 76e295f3824..eb995a057c6 100644 --- a/webapp/src/components/gallery/galleryCard.tsx +++ b/webapp/src/components/gallery/galleryCard.tsx @@ -22,6 +22,9 @@ import CardBadges from '../cardBadges' import CardActionsMenu from '../cardActionsMenu/cardActionsMenu' import ConfirmationDialogBox, {ConfirmationDialogBoxProps} from '../confirmationDialogBox' import CardActionsMenuIcon from '../cardActionsMenu/cardActionsMenuIcon' +import {Utils} from '../../utils' +import {getCardComments} from '../../store/comments' +import {getCardAttachments} from '../../store/attachments' type Props = { board: Board @@ -39,6 +42,8 @@ type Props = { const GalleryCard = (props: Props) => { const intl = useIntl() const {card, board} = props + const comments = useAppSelector(getCardComments(card?.id)) + const attachments = useAppSelector(getCardAttachments(card?.id)) const [isDragging, isOver, cardRef] = useSortable('card', card, props.isManualSort && !props.readonly, props.onDrop) const contents = useAppSelector(getCardContents(card.id)) const [showConfirmationDialogBox, setShowConfirmationDialogBox] = useState(false) @@ -46,6 +51,9 @@ const GalleryCard = (props: Props) => { const visiblePropertyTemplates = props.visiblePropertyTemplates || [] const handleDeleteCard = useCallback(() => { + if (!card) { + return + } mutator.deleteBlock(card, 'delete card') }, [card, board.id]) @@ -60,6 +68,17 @@ const GalleryCard = (props: Props) => { } }, [handleDeleteCard]) + const handleDeleteButtonOnClick = useCallback(() => { + // user trying to delete a card with blank name + // but content present cannot be deleted without + // confirmation dialog + if (Utils.isCardEmpty(card, comments, attachments)) { + handleDeleteCard() + return + } + setShowConfirmationDialogBox(true) + }, [card, comments, attachments]) + const image: ContentBlock|undefined = useMemo(() => { for (let i = 0; i < contents.length; ++i) { if (Array.isArray(contents[i])) { @@ -93,7 +112,7 @@ const GalleryCard = (props: Props) => { setShowConfirmationDialogBox(true)} + onClickDelete={handleDeleteButtonOnClick} onClickDuplicate={() => { TelemetryClient.trackEvent(TelemetryCategory, TelemetryActions.DuplicateCard, {board: board.id, card: card.id}) mutator.duplicateCard(card.id, board.id) diff --git a/webapp/src/components/kanban/kanbanCard.tsx b/webapp/src/components/kanban/kanbanCard.tsx index 3d03f408cd4..f9b4fe8a482 100644 --- a/webapp/src/components/kanban/kanbanCard.tsx +++ b/webapp/src/components/kanban/kanbanCard.tsx @@ -77,12 +77,12 @@ const KanbanCard = (props: Props) => { // user trying to delete a card with blank name // but content present cannot be deleted without // confirmation dialog - if (card?.title === '' && card?.fields?.contentOrder?.length === 0 && Object.keys(card?.fields?.properties).length === 0 && attachments?.length === 0 && comments?.length === 0) { + if (Utils.isCardEmpty(card, comments, attachments)) { handleDeleteCard() return } setShowConfirmationDialogBox(true) - }, [handleDeleteCard, card.title, card?.fields?.contentOrder?.length, card?.fields?.properties, attachments?.length, comments?.length]) + }, [handleDeleteCard, card, comments, attachments]) const handleOnClick = useCallback((e: React.MouseEvent) => { if (props.onClick) { diff --git a/webapp/src/components/table/tableRow.tsx b/webapp/src/components/table/tableRow.tsx index 5f9d04da2f9..fb3e1acef1f 100644 --- a/webapp/src/components/table/tableRow.tsx +++ b/webapp/src/components/table/tableRow.tsx @@ -142,12 +142,12 @@ const TableRow = (props: Props) => { // user trying to delete a card with blank name // but content present cannot be deleted without // confirmation dialog - if (card?.title === '' && card?.fields?.contentOrder?.length === 0 && Object.keys(card?.fields?.properties).length === 0 && attachments?.length === 0 && comments?.length === 0) { + if (Utils.isCardEmpty(card, comments, attachments)) { handleDeleteCard() return } setShowConfirmationDialogBox(true) - }, [card.title, card.fields.contentOrder, handleDeleteCard, card?.fields?.properties, attachments?.length, comments?.length]) + }, [handleDeleteCard, card, comments, attachments]) return (
Date: Thu, 2 Mar 2023 21:26:39 -0700 Subject: [PATCH 05/24] changed the function into a redux selector --- webapp/src/components/cardDialog.tsx | 5 +++-- webapp/src/components/gallery/galleryCard.tsx | 11 ++++------- webapp/src/components/kanban/kanbanCard.tsx | 10 ++++------ webapp/src/components/table/tableRow.tsx | 10 ++++------ webapp/src/store/cards.ts | 10 ++++++++++ webapp/src/utils.ts | 13 ++----------- 6 files changed, 27 insertions(+), 32 deletions(-) diff --git a/webapp/src/components/cardDialog.tsx b/webapp/src/components/cardDialog.tsx index 64c1e4eb3bf..249c47632f0 100644 --- a/webapp/src/components/cardDialog.tsx +++ b/webapp/src/components/cardDialog.tsx @@ -8,7 +8,7 @@ import {BoardView} from '../blocks/boardView' import {Card} from '../blocks/card' import octoClient from '../octoClient' import mutator from '../mutator' -import {getCard} from '../store/cards' +import {getCard, isCardEmpty as isCardEmptySelector} from '../store/cards' import {getCardComments} from '../store/comments' import {getCardContents} from '../store/contents' import {useAppDispatch, useAppSelector} from '../store/hooks' @@ -62,6 +62,7 @@ const CardDialog = (props: Props): JSX.Element => { const dispatch = useAppDispatch() const me = useAppSelector(getMe) const isTemplate = card && card.fields.isTemplate + const isCardEmpty = useAppSelector(isCardEmptySelector(props.cardId)) const [showConfirmationDialogBox, setShowConfirmationDialogBox] = useState(false) const makeTemplateClicked = async () => { @@ -109,7 +110,7 @@ const CardDialog = (props: Props): JSX.Element => { // use may be renaming a card title // and accidently delete the card // so adding des - if (Utils.isCardEmpty(card, comments, attachments)) { + if (isCardEmpty) { handleDeleteCard() return } diff --git a/webapp/src/components/gallery/galleryCard.tsx b/webapp/src/components/gallery/galleryCard.tsx index eb995a057c6..561e7bf2cb4 100644 --- a/webapp/src/components/gallery/galleryCard.tsx +++ b/webapp/src/components/gallery/galleryCard.tsx @@ -22,9 +22,7 @@ import CardBadges from '../cardBadges' import CardActionsMenu from '../cardActionsMenu/cardActionsMenu' import ConfirmationDialogBox, {ConfirmationDialogBoxProps} from '../confirmationDialogBox' import CardActionsMenuIcon from '../cardActionsMenu/cardActionsMenuIcon' -import {Utils} from '../../utils' -import {getCardComments} from '../../store/comments' -import {getCardAttachments} from '../../store/attachments' +import {isCardEmpty as isCardEmptySelector} from '../../store/cards' type Props = { board: Board @@ -42,8 +40,7 @@ type Props = { const GalleryCard = (props: Props) => { const intl = useIntl() const {card, board} = props - const comments = useAppSelector(getCardComments(card?.id)) - const attachments = useAppSelector(getCardAttachments(card?.id)) + const isCardEmpty = useAppSelector(isCardEmptySelector(card?.id)) const [isDragging, isOver, cardRef] = useSortable('card', card, props.isManualSort && !props.readonly, props.onDrop) const contents = useAppSelector(getCardContents(card.id)) const [showConfirmationDialogBox, setShowConfirmationDialogBox] = useState(false) @@ -72,12 +69,12 @@ const GalleryCard = (props: Props) => { // user trying to delete a card with blank name // but content present cannot be deleted without // confirmation dialog - if (Utils.isCardEmpty(card, comments, attachments)) { + if (isCardEmpty) { handleDeleteCard() return } setShowConfirmationDialogBox(true) - }, [card, comments, attachments]) + }, [isCardEmpty]) const image: ContentBlock|undefined = useMemo(() => { for (let i = 0; i < contents.length; ++i) { diff --git a/webapp/src/components/kanban/kanbanCard.tsx b/webapp/src/components/kanban/kanbanCard.tsx index f9b4fe8a482..533e64b632d 100644 --- a/webapp/src/components/kanban/kanbanCard.tsx +++ b/webapp/src/components/kanban/kanbanCard.tsx @@ -20,9 +20,8 @@ import OpenCardTourStep from '../onboardingTour/openCard/open_card' import CopyLinkTourStep from '../onboardingTour/copyLink/copy_link' import CardActionsMenu from '../cardActionsMenu/cardActionsMenu' import CardActionsMenuIcon from '../cardActionsMenu/cardActionsMenuIcon' -import {getCardAttachments} from '../../store/attachments' -import {getCardComments} from '../../store/comments' import {useAppSelector} from '../../store/hooks' +import {isCardEmpty as isCardEmptySelector} from '../../store/cards' export const OnboardingCardClassName = 'onboardingCard' @@ -41,8 +40,7 @@ type Props = { const KanbanCard = (props: Props) => { const {card, board} = props - const comments = useAppSelector(getCardComments(card?.id)) - const attachments = useAppSelector(getCardAttachments(card?.id)) + const isCardEmpty = useAppSelector(isCardEmptySelector(card?.id)) const intl = useIntl() const [isDragging, isOver, cardRef] = useSortable('card', card, !props.readonly, props.onDrop) const visiblePropertyTemplates = props.visiblePropertyTemplates || [] @@ -77,12 +75,12 @@ const KanbanCard = (props: Props) => { // user trying to delete a card with blank name // but content present cannot be deleted without // confirmation dialog - if (Utils.isCardEmpty(card, comments, attachments)) { + if (isCardEmpty) { handleDeleteCard() return } setShowConfirmationDialogBox(true) - }, [handleDeleteCard, card, comments, attachments]) + }, [handleDeleteCard, isCardEmpty]) const handleOnClick = useCallback((e: React.MouseEvent) => { if (props.onClick) { diff --git a/webapp/src/components/table/tableRow.tsx b/webapp/src/components/table/tableRow.tsx index fb3e1acef1f..a2c47a4d05d 100644 --- a/webapp/src/components/table/tableRow.tsx +++ b/webapp/src/components/table/tableRow.tsx @@ -11,8 +11,7 @@ import Button from '../../widgets/buttons/button' import Editable from '../../widgets/editable' import {useSortable} from '../../hooks/sortable' import {useAppSelector} from '../../store/hooks' -import {getCardAttachments} from '../../store/attachments' -import {getCardComments} from '../../store/comments' +import {isCardEmpty as isCardEmptySelector} from '../../store/cards' import {Utils} from '../../utils' @@ -51,8 +50,7 @@ type Props = { const TableRow = (props: Props) => { const intl = useIntl() const {board, card, isManualSort, groupById, visiblePropertyIds, collapsedOptionIds} = props - const comments = useAppSelector(getCardComments(card?.id)) - const attachments = useAppSelector(getCardAttachments(card?.id)) + const isCardEmpty = useAppSelector(isCardEmptySelector(card?.id)) const titleRef = useRef<{ focus(selectAll?: boolean): void }>(null) const [title, setTitle] = useState(props.card.title || '') const isGrouped = Boolean(groupById) @@ -142,12 +140,12 @@ const TableRow = (props: Props) => { // user trying to delete a card with blank name // but content present cannot be deleted without // confirmation dialog - if (Utils.isCardEmpty(card, comments, attachments)) { + if (isCardEmpty) { handleDeleteCard() return } setShowConfirmationDialogBox(true) - }, [handleDeleteCard, card, comments, attachments]) + }, [handleDeleteCard, isCardEmpty]) return (
Card|undefined { } } +export function isCardEmpty(cardId: string): (state: RootState) => boolean { + return (state: RootState): boolean => { + const card = getCards(state)[cardId] + const comments = state.comments.commentsByCard[cardId] + const attachments = state.attachments.attachmentsByCard[cardId] + + return card?.title === '' && card?.fields.contentOrder.length === 0 && Object.keys(card?.fields?.properties).length === 0 && !comments && !attachments + } +} + export const getCurrentBoardCards = createSelector( (state: RootState) => state.boards.current, getCards, diff --git a/webapp/src/utils.ts b/webapp/src/utils.ts index d5f7e67f54d..3a2954d180f 100644 --- a/webapp/src/utils.ts +++ b/webapp/src/utils.ts @@ -13,13 +13,12 @@ import {IUser} from './user' import {Block} from './blocks/block' import {Board as BoardType, BoardMember, createBoard} from './blocks/board' import {createBoardView} from './blocks/boardView' -import {Card as CardBlock, createCard} from './blocks/card' -import {CommentBlock, createCommentBlock} from './blocks/commentBlock' +import {createCard} from './blocks/card' +import {createCommentBlock} from './blocks/commentBlock' import {IAppWindow} from './types' import {ChangeHandlerType, WSMessage} from './wsclient' import {BoardCategoryWebsocketData, Category} from './store/sidebar' import {UserSettings} from './userSettings' -import {AttachmentBlock} from './blocks/attachmentBlock' declare let window: IAppWindow @@ -832,14 +831,6 @@ class Utils { static isAdmin(roles: string): boolean { return Utils.isSystemAdmin(roles) || Utils.isTeamAdmin(roles) } - - static isCardEmpty(card: CardBlock | undefined, comments: CommentBlock[], attachments: AttachmentBlock[]): boolean { - if (!card) { - return true - } - - return card?.title === '' && card?.fields.contentOrder.length === 0 && Object.keys(card?.fields?.properties).length === 0 && attachments?.length === 0 && comments?.length === 0 - } } export {Utils, IDType} From 80d2bac4b112c625ee0e974b34738c95a4ac4e4c Mon Sep 17 00:00:00 2001 From: Jesus Murguia Date: Thu, 2 Mar 2023 22:52:24 -0700 Subject: [PATCH 06/24] fix tests --- webapp/src/store/cards.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/webapp/src/store/cards.ts b/webapp/src/store/cards.ts index d3fd1682bdf..331f02213b9 100644 --- a/webapp/src/store/cards.ts +++ b/webapp/src/store/cards.ts @@ -170,11 +170,7 @@ export function getCard(cardId: string): (state: RootState) => Card|undefined { export function isCardEmpty(cardId: string): (state: RootState) => boolean { return (state: RootState): boolean => { - const card = getCards(state)[cardId] - const comments = state.comments.commentsByCard[cardId] - const attachments = state.attachments.attachmentsByCard[cardId] - - return card?.title === '' && card?.fields.contentOrder.length === 0 && Object.keys(card?.fields?.properties).length === 0 && !comments && !attachments + return getCards(state)[cardId]?.title === '' && getCards(state)[cardId]?.fields.contentOrder.length === 0 && Object.keys(getCards(state)[cardId]?.fields?.properties).length === 0 && !state.comments.commentsByCard[cardId] && !state.attachments.attachmentsByCard[cardId] } } From 8799eb129aa6b925fe0de30c0d0dd2ff27df8d9b Mon Sep 17 00:00:00 2001 From: Jesus Murguia Date: Sat, 4 Mar 2023 17:17:17 -0700 Subject: [PATCH 07/24] changed selector into hook, to use existing selectors --- webapp/src/components/cardDialog.tsx | 5 +++-- webapp/src/components/gallery/galleryCard.tsx | 4 ++-- webapp/src/components/kanban/kanbanCard.tsx | 5 ++--- webapp/src/components/table/tableRow.tsx | 6 ++--- webapp/src/hooks/useIsCardEmpty.ts | 22 +++++++++++++++++++ webapp/src/store/cards.ts | 6 ----- 6 files changed, 31 insertions(+), 17 deletions(-) create mode 100644 webapp/src/hooks/useIsCardEmpty.ts diff --git a/webapp/src/components/cardDialog.tsx b/webapp/src/components/cardDialog.tsx index 249c47632f0..f35c9e08505 100644 --- a/webapp/src/components/cardDialog.tsx +++ b/webapp/src/components/cardDialog.tsx @@ -8,7 +8,8 @@ import {BoardView} from '../blocks/boardView' import {Card} from '../blocks/card' import octoClient from '../octoClient' import mutator from '../mutator' -import {getCard, isCardEmpty as isCardEmptySelector} from '../store/cards' +import {getCard} from '../store/cards' +import {useIsCardEmpty} from '../hooks/useIsCardEmpty' import {getCardComments} from '../store/comments' import {getCardContents} from '../store/contents' import {useAppDispatch, useAppSelector} from '../store/hooks' @@ -62,7 +63,7 @@ const CardDialog = (props: Props): JSX.Element => { const dispatch = useAppDispatch() const me = useAppSelector(getMe) const isTemplate = card && card.fields.isTemplate - const isCardEmpty = useAppSelector(isCardEmptySelector(props.cardId)) + const isCardEmpty = useIsCardEmpty(card) const [showConfirmationDialogBox, setShowConfirmationDialogBox] = useState(false) const makeTemplateClicked = async () => { diff --git a/webapp/src/components/gallery/galleryCard.tsx b/webapp/src/components/gallery/galleryCard.tsx index 561e7bf2cb4..69b5e22a038 100644 --- a/webapp/src/components/gallery/galleryCard.tsx +++ b/webapp/src/components/gallery/galleryCard.tsx @@ -22,7 +22,7 @@ import CardBadges from '../cardBadges' import CardActionsMenu from '../cardActionsMenu/cardActionsMenu' import ConfirmationDialogBox, {ConfirmationDialogBoxProps} from '../confirmationDialogBox' import CardActionsMenuIcon from '../cardActionsMenu/cardActionsMenuIcon' -import {isCardEmpty as isCardEmptySelector} from '../../store/cards' +import {useIsCardEmpty} from '../../hooks/useIsCardEmpty' type Props = { board: Board @@ -40,7 +40,7 @@ type Props = { const GalleryCard = (props: Props) => { const intl = useIntl() const {card, board} = props - const isCardEmpty = useAppSelector(isCardEmptySelector(card?.id)) + const isCardEmpty = useIsCardEmpty(card) const [isDragging, isOver, cardRef] = useSortable('card', card, props.isManualSort && !props.readonly, props.onDrop) const contents = useAppSelector(getCardContents(card.id)) const [showConfirmationDialogBox, setShowConfirmationDialogBox] = useState(false) diff --git a/webapp/src/components/kanban/kanbanCard.tsx b/webapp/src/components/kanban/kanbanCard.tsx index 533e64b632d..4642a8c63c6 100644 --- a/webapp/src/components/kanban/kanbanCard.tsx +++ b/webapp/src/components/kanban/kanbanCard.tsx @@ -7,6 +7,7 @@ import {useIntl} from 'react-intl' import {Board, IPropertyTemplate} from '../../blocks/board' import {Card} from '../../blocks/card' import {useSortable} from '../../hooks/sortable' +import {useIsCardEmpty} from '../../hooks/useIsCardEmpty' import mutator from '../../mutator' import TelemetryClient, {TelemetryActions, TelemetryCategory} from '../../telemetry/telemetryClient' import {Utils} from '../../utils' @@ -20,8 +21,6 @@ import OpenCardTourStep from '../onboardingTour/openCard/open_card' import CopyLinkTourStep from '../onboardingTour/copyLink/copy_link' import CardActionsMenu from '../cardActionsMenu/cardActionsMenu' import CardActionsMenuIcon from '../cardActionsMenu/cardActionsMenuIcon' -import {useAppSelector} from '../../store/hooks' -import {isCardEmpty as isCardEmptySelector} from '../../store/cards' export const OnboardingCardClassName = 'onboardingCard' @@ -40,7 +39,7 @@ type Props = { const KanbanCard = (props: Props) => { const {card, board} = props - const isCardEmpty = useAppSelector(isCardEmptySelector(card?.id)) + const isCardEmpty = useIsCardEmpty(card) const intl = useIntl() const [isDragging, isOver, cardRef] = useSortable('card', card, !props.readonly, props.onDrop) const visiblePropertyTemplates = props.visiblePropertyTemplates || [] diff --git a/webapp/src/components/table/tableRow.tsx b/webapp/src/components/table/tableRow.tsx index a2c47a4d05d..23bc34c6f5b 100644 --- a/webapp/src/components/table/tableRow.tsx +++ b/webapp/src/components/table/tableRow.tsx @@ -10,9 +10,7 @@ import mutator from '../../mutator' import Button from '../../widgets/buttons/button' import Editable from '../../widgets/editable' import {useSortable} from '../../hooks/sortable' -import {useAppSelector} from '../../store/hooks' -import {isCardEmpty as isCardEmptySelector} from '../../store/cards' - +import {useIsCardEmpty} from '../../hooks/useIsCardEmpty' import {Utils} from '../../utils' import PropertyValueElement from '../propertyValueElement' @@ -50,7 +48,7 @@ type Props = { const TableRow = (props: Props) => { const intl = useIntl() const {board, card, isManualSort, groupById, visiblePropertyIds, collapsedOptionIds} = props - const isCardEmpty = useAppSelector(isCardEmptySelector(card?.id)) + const isCardEmpty = useIsCardEmpty(card) const titleRef = useRef<{ focus(selectAll?: boolean): void }>(null) const [title, setTitle] = useState(props.card.title || '') const isGrouped = Boolean(groupById) diff --git a/webapp/src/hooks/useIsCardEmpty.ts b/webapp/src/hooks/useIsCardEmpty.ts new file mode 100644 index 00000000000..106000cf611 --- /dev/null +++ b/webapp/src/hooks/useIsCardEmpty.ts @@ -0,0 +1,22 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +import {useMemo} from 'react' + +import {useAppSelector} from '../store/hooks' +import {Card} from '../blocks/card' +import {getCardComments} from '../store/comments' +import {getCardAttachments} from '../store/attachments' + +export const useIsCardEmpty = (card: Card | undefined) => { + if (!card) { + return true + } + + const comments = useAppSelector(getCardComments(card.id)) + const attachments = useAppSelector(getCardAttachments(card.id)) + + return useMemo(() => { + return card?.title === '' && card?.fields.contentOrder.length === 0 && Object.values(card?.fields?.properties).every((x) => !x.length) && comments.length === 0 && attachments.length === 0 + }, [card?.title, card?.fields.contentOrder, card?.fields?.properties, comments, attachments]) +} diff --git a/webapp/src/store/cards.ts b/webapp/src/store/cards.ts index 331f02213b9..5f30f6f60a6 100644 --- a/webapp/src/store/cards.ts +++ b/webapp/src/store/cards.ts @@ -168,12 +168,6 @@ export function getCard(cardId: string): (state: RootState) => Card|undefined { } } -export function isCardEmpty(cardId: string): (state: RootState) => boolean { - return (state: RootState): boolean => { - return getCards(state)[cardId]?.title === '' && getCards(state)[cardId]?.fields.contentOrder.length === 0 && Object.keys(getCards(state)[cardId]?.fields?.properties).length === 0 && !state.comments.commentsByCard[cardId] && !state.attachments.attachmentsByCard[cardId] - } -} - export const getCurrentBoardCards = createSelector( (state: RootState) => state.boards.current, getCards, From 293b62a971bc303c0137208b5fa46375324935da Mon Sep 17 00:00:00 2001 From: Jesus Murguia Date: Sat, 4 Mar 2023 17:21:54 -0700 Subject: [PATCH 08/24] created fullCalendarCard --- .../src/components/calendar/fullCalendar.tsx | 97 ++------------ .../components/calendar/fullCalendarCard.tsx | 120 ++++++++++++++++++ 2 files changed, 133 insertions(+), 84 deletions(-) create mode 100644 webapp/src/components/calendar/fullCalendarCard.tsx diff --git a/webapp/src/components/calendar/fullCalendar.tsx b/webapp/src/components/calendar/fullCalendar.tsx index 7c1fccf263d..0f5cfac11eb 100644 --- a/webapp/src/components/calendar/fullCalendar.tsx +++ b/webapp/src/components/calendar/fullCalendar.tsx @@ -1,7 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import React, {useCallback, useMemo, useState} from 'react' +import React, {useCallback, useMemo} from 'react' import {useIntl} from 'react-intl' import FullCalendar, {EventChangeArg, EventInput, EventContentArg, DayCellContentArg} from '@fullcalendar/react' @@ -18,18 +18,12 @@ import {BoardView} from '../../blocks/boardView' import {Card} from '../../blocks/card' import {DateProperty} from '../../properties/date/date' import propsRegistry from '../../properties' -import Tooltip from '../../widgets/tooltip' -import PropertyValueElement from '../propertyValueElement' import {Constants, Permission} from '../../constants' import {useHasCurrentBoardPermissions} from '../../hooks/permissions' -import CardBadges from '../cardBadges' -import ConfirmationDialogBox, {ConfirmationDialogBoxProps} from '../confirmationDialogBox' import './fullcalendar.scss' -import MenuWrapper from '../../widgets/menuWrapper' -import CardActionsMenu from '../cardActionsMenu/cardActionsMenu' -import TelemetryClient, {TelemetryActions, TelemetryCategory} from '../../telemetry/telemetryClient' -import CardActionsMenuIcon from '../cardActionsMenu/cardActionsMenuIcon' + +import FullCalendarCard from './fullCalendarCard' const oneDay = 60 * 60 * 24 * 1000 @@ -76,8 +70,6 @@ const CalendarFullView = (props: Props): JSX.Element|null => { const {board, cards, activeView, dateDisplayProperty, readonly} = props const isSelectable = !readonly const canAddCards = useHasCurrentBoardPermissions([Permission.ManageBoardCards]) - const [showConfirmationDialogBox, setShowConfirmationDialogBox] = useState(false) - const [cardItem, setCardItem] = useState() const visiblePropertyTemplates = useMemo(() => ( board.cardProperties.filter((template: IPropertyTemplate) => activeView.fields.visiblePropertyIds.includes(template.id)) @@ -127,82 +119,20 @@ const CalendarFullView = (props: Props): JSX.Element|null => { const visibleBadges = activeView.fields.visiblePropertyIds.includes(Constants.badgesColumnId) - const openConfirmationDialogBox = (card: Card) => { - setShowConfirmationDialogBox(true) - setCardItem(card) - } - - const handleDeleteCard = useCallback(() => { - if (!cardItem) { - return - } - mutator.deleteBlock(cardItem, 'delete card') - setShowConfirmationDialogBox(false) - }, [cardItem, board.id]) - - const confirmDialogProps: ConfirmationDialogBoxProps = useMemo(() => { - return { - heading: intl.formatMessage({id: 'CardDialog.delete-confirmation-dialog-heading', defaultMessage: 'Confirm card delete!'}), - confirmButtonText: intl.formatMessage({id: 'CardDialog.delete-confirmation-dialog-button-text', defaultMessage: 'Delete'}), - onConfirm: handleDeleteCard, - onClose: () => { - setShowConfirmationDialogBox(false) - }, - } - }, [handleDeleteCard]) - const renderEventContent = (eventProps: EventContentArg): JSX.Element|null => { const {event} = eventProps const card = cards.find((o) => o.id === event.id) || cards[0] - return ( - <> -
props.showCard(event.id)} - > - {!props.readonly && - - - openConfirmationDialogBox(card)} - onClickDuplicate={() => { - TelemetryClient.trackEvent(TelemetryCategory, TelemetryActions.DuplicateCard, {board: board.id, card: card.id}) - mutator.duplicateCard(card.id, board.id) - }} - /> - } -
- { event.extendedProps.icon ?
{event.extendedProps.icon}
: undefined } -
{event.title || intl.formatMessage({id: 'CalendarCard.untitled', defaultMessage: 'Untitled'})}
-
- {visiblePropertyTemplates.map((template) => ( - - - - ))} - {visibleBadges && - } -
- - ) + ) } const eventChange = useCallback((eventProps: EventChangeArg) => { @@ -292,7 +222,6 @@ const CalendarFullView = (props: Props): JSX.Element|null => { selectMirror={true} select={onNewEvent} /> - {showConfirmationDialogBox && }
) } diff --git a/webapp/src/components/calendar/fullCalendarCard.tsx b/webapp/src/components/calendar/fullCalendarCard.tsx new file mode 100644 index 00000000000..cc4653b46aa --- /dev/null +++ b/webapp/src/components/calendar/fullCalendarCard.tsx @@ -0,0 +1,120 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +import React, {useCallback, useMemo, useState} from 'react' +import {useIntl} from 'react-intl' + +import {EventApi} from '@fullcalendar/react' + +import {useIsCardEmpty} from '../../hooks/useIsCardEmpty' +import mutator from '../../mutator' + +import {Board, IPropertyTemplate} from '../../blocks/board' +import {Card} from '../../blocks/card' +import Tooltip from '../../widgets/tooltip' +import PropertyValueElement from '../propertyValueElement' +import CardBadges from '../cardBadges' +import ConfirmationDialogBox, {ConfirmationDialogBoxProps} from '../confirmationDialogBox' + +import './fullcalendar.scss' +import MenuWrapper from '../../widgets/menuWrapper' +import CardActionsMenu from '../cardActionsMenu/cardActionsMenu' +import TelemetryClient, {TelemetryActions, TelemetryCategory} from '../../telemetry/telemetryClient' +import CardActionsMenuIcon from '../cardActionsMenu/cardActionsMenuIcon' + +type Props = { + card: Card + board: Board + event: EventApi + visiblePropertyTemplates: IPropertyTemplate[] + visibleBadges: boolean + readonly: boolean + showCard: (cardId: string) => void +} + +const FullCalendarCard = (props: Props): JSX.Element|null => { + const {card, board, event, visiblePropertyTemplates, visibleBadges} = props + const isCardEmpty = useIsCardEmpty(card) + const intl = useIntl() + const [showConfirmationDialogBox, setShowConfirmationDialogBox] = useState(false) + + const handleDeleteCard = useCallback(() => { + if (!card) { + return + } + mutator.deleteBlock(card, 'delete card') + setShowConfirmationDialogBox(false) + }, [card, board.id]) + + const handleDeleteButtonOnClick = useCallback(() => { + // user trying to delete a card with blank name + // but content present cannot be deleted without + // confirmation dialog + if (isCardEmpty) { + handleDeleteCard() + return + } + setShowConfirmationDialogBox(true) + }, [handleDeleteCard, isCardEmpty]) + + const confirmDialogProps: ConfirmationDialogBoxProps = useMemo(() => { + return { + heading: intl.formatMessage({id: 'CardDialog.delete-confirmation-dialog-heading', defaultMessage: 'Confirm card delete!'}), + confirmButtonText: intl.formatMessage({id: 'CardDialog.delete-confirmation-dialog-button-text', defaultMessage: 'Delete'}), + onConfirm: handleDeleteCard, + onClose: () => { + setShowConfirmationDialogBox(false) + }, + } + }, [handleDeleteCard]) + + return (<> +
props.showCard(event.id)} + > + {!props.readonly && + + + { + TelemetryClient.trackEvent(TelemetryCategory, TelemetryActions.DuplicateCard, {board: board.id, card: card.id}) + mutator.duplicateCard(card.id, board.id) + }} + /> + } +
+ { event.extendedProps.icon ?
{event.extendedProps.icon}
: undefined } +
{event.title || intl.formatMessage({id: 'CalendarCard.untitled', defaultMessage: 'Untitled'})}
+
+ {visiblePropertyTemplates.map((template) => ( + + + + ))} + {visibleBadges && + } +
+ {showConfirmationDialogBox && } + ) +} + +export default React.memo(FullCalendarCard) From 4d14413bdaa65105ef5fe77c2402090a6945dc59 Mon Sep 17 00:00:00 2001 From: Jesus Murguia Date: Mon, 6 Mar 2023 17:32:21 -0700 Subject: [PATCH 09/24] removed the event prop as it was unnecesary --- webapp/src/components/calendar/fullCalendar.tsx | 1 - webapp/src/components/calendar/fullCalendarCard.tsx | 11 ++++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/webapp/src/components/calendar/fullCalendar.tsx b/webapp/src/components/calendar/fullCalendar.tsx index 0f5cfac11eb..12e851c8598 100644 --- a/webapp/src/components/calendar/fullCalendar.tsx +++ b/webapp/src/components/calendar/fullCalendar.tsx @@ -126,7 +126,6 @@ const CalendarFullView = (props: Props): JSX.Element|null => { { - const {card, board, event, visiblePropertyTemplates, visibleBadges} = props + const {card, board, visiblePropertyTemplates, visibleBadges} = props const isCardEmpty = useIsCardEmpty(card) const intl = useIntl() const [showConfirmationDialogBox, setShowConfirmationDialogBox] = useState(false) @@ -71,7 +68,7 @@ const FullCalendarCard = (props: Props): JSX.Element|null => { return (<>
props.showCard(event.id)} + onClick={() => props.showCard(card.id)} > {!props.readonly && { /> }
- { event.extendedProps.icon ?
{event.extendedProps.icon}
: undefined } + { card.fields.icon ?
{card.fields.icon}
: undefined }
{event.title || intl.formatMessage({id: 'CalendarCard.untitled', defaultMessage: 'Untitled'})}
+ >{card.title || intl.formatMessage({id: 'CalendarCard.untitled', defaultMessage: 'Untitled'})}
{visiblePropertyTemplates.map((template) => ( Date: Mon, 6 Mar 2023 17:36:33 -0700 Subject: [PATCH 10/24] added unit tests for FullCalendarCard component --- .../fullCalendarCard.test.tsx.snap | 616 ++++++++++++++++++ .../calendar/fullCalendarCard.test.tsx | 186 ++++++ 2 files changed, 802 insertions(+) create mode 100644 webapp/src/components/calendar/__snapshots__/fullCalendarCard.test.tsx.snap create mode 100644 webapp/src/components/calendar/fullCalendarCard.test.tsx diff --git a/webapp/src/components/calendar/__snapshots__/fullCalendarCard.test.tsx.snap b/webapp/src/components/calendar/__snapshots__/fullCalendarCard.test.tsx.snap new file mode 100644 index 00000000000..e461837d6f1 --- /dev/null +++ b/webapp/src/components/calendar/__snapshots__/fullCalendarCard.test.tsx.snap @@ -0,0 +1,616 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`src/components/calendar/fullCalendarCard return FullCalendarCard and click on copy link menu 1`] = ` +
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+ Delete +
+
+
+
+
+
+
+ +
+
+
+
+ Duplicate +
+
+
+
+
+
+
+
+
+ +
+
+
+
+ Copy link +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Cancel +
+
+
+
+
+
+
+
+
+
+ i +
+
+ title +
+
+
+
+
+
+
+`; + +exports[`src/components/calendar/fullCalendarCard return FullCalendarCard and click on delete menu 1`] = ` +
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+ Delete +
+
+
+
+
+
+
+ +
+
+
+
+ Duplicate +
+
+
+
+
+
+
+
+
+ +
+
+
+
+ Copy link +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Cancel +
+
+
+
+
+
+
+
+
+
+ i +
+
+ title +
+
+
+
+
+
+
+`; + +exports[`src/components/calendar/fullCalendarCard return FullCalendarCard and click on duplicate menu 1`] = ` +
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+ Delete +
+
+
+
+
+
+
+ +
+
+
+
+ Duplicate +
+
+
+
+
+
+
+
+
+ +
+
+
+
+ Copy link +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Cancel +
+
+
+
+
+
+
+
+
+
+ i +
+
+ title +
+
+
+
+
+
+
+`; + +exports[`src/components/calendar/fullCalendarCard should match snapshot 1`] = ` +
+
+
+ +
+
+
+ i +
+
+ title +
+
+
+
+
+
+
+`; + +exports[`src/components/calendar/fullCalendarCard should match snapshot with readonly 1`] = ` +
+
+
+
+ i +
+
+ title +
+
+
+
+
+
+
+`; diff --git a/webapp/src/components/calendar/fullCalendarCard.test.tsx b/webapp/src/components/calendar/fullCalendarCard.test.tsx new file mode 100644 index 00000000000..8fdfac8ed4a --- /dev/null +++ b/webapp/src/components/calendar/fullCalendarCard.test.tsx @@ -0,0 +1,186 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. +import React from 'react' +import {render, screen, within} from '@testing-library/react' +import '@testing-library/jest-dom' +import {MemoryRouter} from 'react-router-dom' + +import {Provider as ReduxProvider} from 'react-redux' + +import userEvent from '@testing-library/user-event' + +import {mocked} from 'jest-mock' + +import Mutator from '../../mutator' +import {Utils} from '../../utils' + +import {TestBlockFactory} from '../../test/testBlockFactory' +import {IPropertyTemplate} from '../../blocks/board' +import {mockStateStore, wrapDNDIntl} from '../../testUtils' + +import FullCalendarCard from './fullCalendarCard' + +jest.mock('../../mutator') +jest.mock('../../utils') +jest.mock('../../telemetry/telemetryClient') +const mockedUtils = mocked(Utils, true) +const mockedMutator = mocked(Mutator, true) + +describe('src/components/calendar/fullCalendarCard', () => { + const board = TestBlockFactory.createBoard() + const card = TestBlockFactory.createCard(board) + const propertyTemplate: IPropertyTemplate = { + id: 'id', + name: 'name', + type: 'text', + options: [ + { + color: 'propColorOrange', + id: 'property_value_id_1', + value: 'Q1', + }, + { + color: 'propColorBlue', + id: 'property_value_id_2', + value: 'Q2', + }, + ], + } + const state = { + cards: { + cards: [card], + }, + teams: { + current: {id: 'team-id'}, + }, + boards: { + current: 'board_id_1', + boards: { + board_id_1: {id: 'board_id_1'}, + }, + myBoardMemberships: { + board_id_1: {userId: 'user_id_1', schemeAdmin: true}, + }, + }, + contents: {}, + comments: { + comments: {}, + }, + users: { + me: { + id: 'user_id_1', + props: {}, + }, + }, + } + const store = mockStateStore([], state) + beforeEach(jest.clearAllMocks) + test('should match snapshot', () => { + const {container} = render(wrapDNDIntl( + + + , + ), {wrapper: MemoryRouter}) + expect(container).toMatchSnapshot() + }) + test('should match snapshot with readonly', () => { + const {container} = render(wrapDNDIntl( + + + , + ), {wrapper: MemoryRouter}) + expect(container).toMatchSnapshot() + }) + test('return FullCalendarCard and click on delete menu ', () => { + const result = render(wrapDNDIntl( + + + , + ), {wrapper: MemoryRouter}) + + const {container} = result + + const elementMenuWrapper = screen.getByRole('button', {name: 'menuwrapper'}) + expect(elementMenuWrapper).not.toBeNull() + userEvent.click(elementMenuWrapper) + expect(container).toMatchSnapshot() + const elementButtonDelete = within(elementMenuWrapper).getByRole('button', {name: 'Delete'}) + expect(elementButtonDelete).not.toBeNull() + userEvent.click(elementButtonDelete) + + const confirmDialog = screen.getByTitle('Confirmation Dialog Box') + expect(confirmDialog).toBeDefined() + const confirmButton = within(confirmDialog).getByRole('button', {name: 'Delete'}) + expect(confirmButton).toBeDefined() + userEvent.click(confirmButton) + + expect(mockedMutator.deleteBlock).toBeCalledWith(card, 'delete card') + }) + + test('return FullCalendarCard and click on duplicate menu ', () => { + const {container} = render(wrapDNDIntl( + + + , + ), {wrapper: MemoryRouter}) + const elementMenuWrapper = screen.getByRole('button', {name: 'menuwrapper'}) + expect(elementMenuWrapper).not.toBeNull() + userEvent.click(elementMenuWrapper) + expect(container).toMatchSnapshot() + const elementButtonDuplicate = within(elementMenuWrapper).getByRole('button', {name: 'Duplicate'}) + expect(elementButtonDuplicate).not.toBeNull() + userEvent.click(elementButtonDuplicate) + expect(mockedMutator.duplicateCard).toBeCalledTimes(1) + }) + + test('return FullCalendarCard and click on copy link menu ', () => { + const {container} = render(wrapDNDIntl( + + + , + ), {wrapper: MemoryRouter}) + const elementMenuWrapper = screen.getByRole('button', {name: 'menuwrapper'}) + expect(elementMenuWrapper).not.toBeNull() + userEvent.click(elementMenuWrapper) + expect(container).toMatchSnapshot() + const elementButtonCopyLink = within(elementMenuWrapper).getByRole('button', {name: 'Copy link'}) + expect(elementButtonCopyLink).not.toBeNull() + userEvent.click(elementButtonCopyLink) + expect(mockedUtils.copyTextToClipboard).toBeCalledTimes(1) + }) +}) From 77b5086fcc5ac767a006c75a7a1504730d616f0e Mon Sep 17 00:00:00 2001 From: Chetanya Kandhari Date: Sat, 11 Mar 2023 15:21:14 +0000 Subject: [PATCH 11/24] Fix indentation for tsconfix.json --- mattermost-plugin/webapp/tsconfig.json | 59 ++++++++++++++------------ 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/mattermost-plugin/webapp/tsconfig.json b/mattermost-plugin/webapp/tsconfig.json index 32c6a731d61..cc371e82767 100644 --- a/mattermost-plugin/webapp/tsconfig.json +++ b/mattermost-plugin/webapp/tsconfig.json @@ -1,31 +1,34 @@ { - "compilerOptions": { - "jsx": "react", - "target": "es2019", - "module": "commonjs", - "esModuleInterop": true, - "noImplicitAny": true, - "strict": true, - "strictNullChecks": true, - "forceConsistentCasingInFileNames": true, - "sourceMap": true, - "allowJs": true, - "resolveJsonModule": true, - "incremental": false, - "outDir": "./dist", - "moduleResolution": "node", - "typeRoots": [ "./src/types", "./node_modules/@types"] - }, - "include": [ - "src", - "../../webapp/src" - ], - "exclude": [ - ".git", - "**/node_modules/*", - "pack", - "dist", - "node_modules", - "!node_modules/@types" + "compilerOptions": { + "jsx": "react", + "target": "es2019", + "module": "commonjs", + "esModuleInterop": true, + "noImplicitAny": true, + "strict": true, + "strictNullChecks": true, + "forceConsistentCasingInFileNames": true, + "sourceMap": true, + "allowJs": true, + "resolveJsonModule": true, + "incremental": false, + "outDir": "./dist", + "moduleResolution": "node", + "typeRoots": [ + "./src/types", + "./node_modules/@types" ] + }, + "include": [ + "src", + "../../webapp/src" + ], + "exclude": [ + ".git", + "**/node_modules/*", + "pack", + "dist", + "node_modules", + "!node_modules/@types" + ] } From 347a49f02aa64464409c5442dba496fb60128392 Mon Sep 17 00:00:00 2001 From: Baris Date: Sun, 9 Apr 2023 19:58:23 +0300 Subject: [PATCH 12/24] 4621 Added color property to react-select singleValue --- webapp/src/components/personSelector.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/webapp/src/components/personSelector.tsx b/webapp/src/components/personSelector.tsx index c9d7c7a79bb..f50af067143 100644 --- a/webapp/src/components/personSelector.tsx +++ b/webapp/src/components/personSelector.tsx @@ -60,6 +60,7 @@ const selectStyles = { position: 'static', top: 'unset', transform: 'unset', + color: 'rgb(var(--center-channel-color-rgb))', }), menu: (provided: CSSObject): CSSObject => ({ ...provided, From f7b8dda1272af47a77338fc47f2918bc2d5ee60b Mon Sep 17 00:00:00 2001 From: Baris Date: Mon, 10 Apr 2023 00:04:10 +0300 Subject: [PATCH 13/24] Max width for tooltip is disabled ... So users could read long file names when hovering on it. - Tooltip position is changed. New position starts in accordance with file's name --- webapp/src/widgets/tooltip.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/webapp/src/widgets/tooltip.scss b/webapp/src/widgets/tooltip.scss index cab5233fbe7..c9ca7f14d9b 100644 --- a/webapp/src/widgets/tooltip.scss +++ b/webapp/src/widgets/tooltip.scss @@ -22,10 +22,7 @@ $tooltop-vertical-offset: 2px; text-shadow: rgba(0, 0, 0, 0.098) 1px 1px 1px; box-shadow: rgba(0, 0, 0, 0.1) 1px 1px 2px 0; min-width: 2em; - max-width: 21em; white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; display: block; } @@ -102,8 +99,6 @@ $tooltop-vertical-offset: 2px; } // Bottom tooltip body style &.tooltip-bottom:hover::after { - left: 50%; top: calc(100% + 4px); - transform: translate(-50%, -#{$tooltop-horizontal-offset}); } } From 05ae50caa82e994b39e7cac687a9af1505217d4d Mon Sep 17 00:00:00 2001 From: Baris Date: Mon, 10 Apr 2023 21:57:14 +0300 Subject: [PATCH 14/24] Overflow of table selector is changed from... auto to hidden so that users wont see horizontal scroll bar during new template. --- webapp/src/components/table/table.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/components/table/table.scss b/webapp/src/components/table/table.scss index 6d36a721581..9a3a8f20401 100644 --- a/webapp/src/components/table/table.scss +++ b/webapp/src/components/table/table.scss @@ -3,7 +3,7 @@ .Table { margin-top: 16px; margin-left: 0 !important; - overflow: auto; + overflow: hidden; position: relative; flex: 1; From 7d99f7dc7a5429f245b280c24734de2e67fb1a1b Mon Sep 17 00:00:00 2001 From: jiushi Date: Sun, 10 Sep 2023 00:33:01 +0800 Subject: [PATCH 15/24] =?UTF-8?q?fixed=20Bug=EF=BC=9AAfter=20deleting=20a?= =?UTF-8?q?=20board,=20using=20the=20undo=20feature=20would=20redirect=20t?= =?UTF-8?q?o=20an=20error=20page=20displaying=20"board-not-found."?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webapp/src/mutator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/mutator.ts b/webapp/src/mutator.ts index 3dea2ae4103..c616b69ccee 100644 --- a/webapp/src/mutator.ts +++ b/webapp/src/mutator.ts @@ -224,8 +224,8 @@ class Mutator { await afterRedo?.(board) }, async () => { - await beforeUndo?.(board) await octoClient.undeleteBoard(board.id) + await beforeUndo?.(board) }, description, this.undoGroupId, From 65e796ed500934a8c7fd6e60bb0dff187209915e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Burzy=C5=84ski?= Date: Mon, 9 Oct 2023 00:06:36 +0200 Subject: [PATCH 16/24] Replace a non-semantic JSX child in one of the test files with an empty fragment --- webapp/src/components/kanban/kanbanColumn.test.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/components/kanban/kanbanColumn.test.tsx b/webapp/src/components/kanban/kanbanColumn.test.tsx index b861dd4dcdd..7de61f9b9ed 100644 --- a/webapp/src/components/kanban/kanbanColumn.test.tsx +++ b/webapp/src/components/kanban/kanbanColumn.test.tsx @@ -12,7 +12,7 @@ describe('src/components/kanban/kanbanColumn', () => { - {} + <> , )) expect(container).toMatchSnapshot() From 8071eb874d65c1584b94e4aaaaaf81a4e0c60a15 Mon Sep 17 00:00:00 2001 From: omggga Date: Wed, 18 Oct 2023 13:40:59 +0300 Subject: [PATCH 17/24] prevent ModifiedBy overwrite --- server/app/import.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server/app/import.go b/server/app/import.go index 2852c0e3e8a..d1e47171e4f 100644 --- a/server/app/import.go +++ b/server/app/import.go @@ -200,7 +200,9 @@ func (a *App) ImportBoardJSONL(r io.Reader, opt model.ImportArchiveOptions) (*mo if err2 := json.Unmarshal(archiveLine.Data, &board); err2 != nil { return nil, fmt.Errorf("invalid board in archive line %d: %w", lineNum, err2) } - board.ModifiedBy = userID + if board.ModifiedBy == "" { + board.ModifiedBy = userID + } board.UpdateAt = now board.TeamID = opt.TeamID boardsAndBlocks.Boards = append(boardsAndBlocks.Boards, &board) @@ -224,7 +226,9 @@ func (a *App) ImportBoardJSONL(r io.Reader, opt model.ImportArchiveOptions) (*mo if err2 := json.Unmarshal(archiveLine.Data, &block); err2 != nil { return nil, fmt.Errorf("invalid block in archive line %d: %w", lineNum, err2) } - block.ModifiedBy = userID + if block.ModifiedBy == "" { + block.ModifiedBy = userID + } block.UpdateAt = now block.BoardID = boardID boardsAndBlocks.Blocks = append(boardsAndBlocks.Blocks, block) From 60b2e2a3bef777c9b6559b2f4967ea7464d57373 Mon Sep 17 00:00:00 2001 From: BaoNguyen Date: Sat, 28 Oct 2023 07:59:06 +0900 Subject: [PATCH 18/24] Update win-wpf app to persist user settings (issue #314) --- webapp/src/nativeApp.ts | 6 + webapp/src/types/index.d.ts | 1 + win-wpf/.gitignore | 484 +++++++++++++++++- win-wpf/Focalboard.sln | 4 +- win-wpf/Focalboard/App.config | 17 +- win-wpf/Focalboard/Focalboard.csproj | 33 +- win-wpf/Focalboard/MainWindow.xaml.cs | 315 +++++++----- .../Properties/Settings.Designer.cs | 14 +- .../Focalboard/Properties/Settings.settings | 3 + win-wpf/Focalboard/WebMessage.cs | 13 + win-wpf/Focalboard/packages.config | 9 + 11 files changed, 744 insertions(+), 155 deletions(-) create mode 100644 win-wpf/Focalboard/WebMessage.cs diff --git a/webapp/src/nativeApp.ts b/webapp/src/nativeApp.ts index 35441285196..d071b910d4a 100644 --- a/webapp/src/nativeApp.ts +++ b/webapp/src/nativeApp.ts @@ -18,13 +18,19 @@ export function importNativeAppSettings(): void { const importedKeys = importUserSettingsBlob(NativeApp.settingsBlob) const messageType = importedKeys.length ? 'didImportUserSettings' : 'didNotImportUserSettings' postWebKitMessage({type: messageType, settingsBlob: exportUserSettingsBlob(), keys: importedKeys}) + postWebViewMessage({type: messageType, settingsBlob: exportUserSettingsBlob(), keys: importedKeys}) NativeApp.settingsBlob = null } export function notifySettingsChanged(key: string): void { postWebKitMessage({type: 'didChangeUserSettings', settingsBlob: exportUserSettingsBlob(), key}) + postWebViewMessage({type: 'didChangeUserSettings', settingsBlob: exportUserSettingsBlob(), key}) } function postWebKitMessage(message: T) { window.webkit?.messageHandlers.nativeApp?.postMessage(message) } + +function postWebViewMessage(message: T) { + window.chrome?.webview?.postMessage(message) +} diff --git a/webapp/src/types/index.d.ts b/webapp/src/types/index.d.ts index a30f46e4cb8..0434ff73d75 100644 --- a/webapp/src/types/index.d.ts +++ b/webapp/src/types/index.d.ts @@ -13,6 +13,7 @@ export interface IAppWindow extends Window { openInNewBrowser?: ((href: string) => void) | null webkit?: {messageHandlers: {nativeApp?: {postMessage: (message: T) => void}}} openPricingModal?: () => (telemetry: TelemetryProps) => void + chrome?: {webview?: {postMessage: (message: T) => void}} } // SuiteWindow documents all custom properties diff --git a/win-wpf/.gitignore b/win-wpf/.gitignore index c491e5093e6..d587254d15b 100644 --- a/win-wpf/.gitignore +++ b/win-wpf/.gitignore @@ -1,8 +1,482 @@ -packages -obj +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET +project.lock.json +project.fragment.lock.json +artifacts/ + +# Tye +.tye/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.tlog +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files +*.ncb +*.aps + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml + +## +## Visual studio for Mac +## + + +# globs +Makefile.in +*.userprefs +*.usertasks +config.make +config.status +aclocal.m4 +install-sh +autom4te.cache/ +*.tar.gz +tarballs/ +test-results/ + +# Mac bundle stuff +*.dmg +*.app + +# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# Focalboard defaults msix temp dist -*.msix -*.suo -*.csproj.user diff --git a/win-wpf/Focalboard.sln b/win-wpf/Focalboard.sln index 58bc104e1f4..b93be94ce28 100644 --- a/win-wpf/Focalboard.sln +++ b/win-wpf/Focalboard.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30907.101 +# Visual Studio Version 17 +VisualStudioVersion = 17.7.34221.43 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Focalboard", "Focalboard\Focalboard.csproj", "{7B3F5C74-96AC-4521-9268-28BF2D91FCF4}" EndProject diff --git a/win-wpf/Focalboard/App.config b/win-wpf/Focalboard/App.config index c1fb6c7572b..3dc842e3ac5 100644 --- a/win-wpf/Focalboard/App.config +++ b/win-wpf/Focalboard/App.config @@ -1,12 +1,12 @@ - + -
+
- + @@ -19,6 +19,17 @@ False + + + + + + + + + + + diff --git a/win-wpf/Focalboard/Focalboard.csproj b/win-wpf/Focalboard/Focalboard.csproj index 56f2f9e47a7..ce225d300b3 100644 --- a/win-wpf/Focalboard/Focalboard.csproj +++ b/win-wpf/Focalboard/Focalboard.csproj @@ -16,6 +16,8 @@ true + false + publish\ true Disk @@ -28,10 +30,8 @@ true 0 1.0.0.%2a - false false true - AnyCPU @@ -79,6 +79,9 @@ focalboard.ico + + ..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + ..\packages\Microsoft.Web.WebView2.1.0.705.50\lib\net45\Microsoft.Web.WebView2.Core.dll @@ -89,13 +92,38 @@ ..\packages\Microsoft.Web.WebView2.1.0.705.50\lib\net45\Microsoft.Web.WebView2.Wpf.dll + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + False $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETCore\v4.5\System.Runtime.WindowsRuntime.dll False + + ..\packages\System.Text.Encodings.Web.7.0.0\lib\net462\System.Text.Encodings.Web.dll + + + ..\packages\System.Text.Json.7.0.3\lib\net462\System.Text.Json.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + @@ -119,6 +147,7 @@ Designer + MSBuild:Compile diff --git a/win-wpf/Focalboard/MainWindow.xaml.cs b/win-wpf/Focalboard/MainWindow.xaml.cs index cd3e4f158ab..19d473576f9 100644 --- a/win-wpf/Focalboard/MainWindow.xaml.cs +++ b/win-wpf/Focalboard/MainWindow.xaml.cs @@ -3,151 +3,182 @@ using System; using System.Diagnostics; using System.IO; +using System.Text.Json; using System.Windows; using System.Windows.Input; using Microsoft.Web.WebView2.Core; namespace Focalboard { - /// - /// Interaction logic for MainWindow.xaml - /// - public partial class MainWindow : Window { - private int port { - get { return ((App)Application.Current).port; } - } - - private string sessionToken { - get { return ((App)Application.Current).sessionToken; } - } - - public MainWindow() { - Debug.WriteLine($"MainWindow()"); - - InitializeComponent(); - - RestoreWindowsState(); - - this.Loaded += MainWindow_Loaded; - this.Closing += MainWindow_Closing; - - InitializeWebView(); - } - - private void MainWindow_Loaded(object sender, RoutedEventArgs e) { - Activate(); - } - - private void PromptToInstallWebview2() { - var dialogResult = MessageBox.Show( - "Focalboard requires the WebView2 runtime to be downloaded and installed. Install now?", - "Focalboard", - MessageBoxButton.YesNo, - MessageBoxImage.Information, - MessageBoxResult.OK, - MessageBoxOptions.DefaultDesktopOnly); - - if (dialogResult == MessageBoxResult.Yes) { - installingLabel.Visibility = Visibility.Visible; - webView.Visibility = Visibility.Collapsed; - - var installer = new Webview2Installer(); - installer.InstallProgress += Installer_InstallProgress; - installer.InstallCompleted += Installer_InstallCompleted; - installer.DownloadAndInstall(); - } - } - - private void Installer_InstallProgress(Webview2Installer sender, EventArgs e) { - Application.Current.Dispatcher.Invoke(() => { - if (sender.downloadProgress < 100) { - installingLabel.Content = $"Downloading Webview2: {sender.downloadProgress}%"; - } else { - installingLabel.Content = "Installing Webview2..."; - } - }); - } - - private void Installer_InstallCompleted(Webview2Installer sender, EventArgs e) { - Application.Current.Dispatcher.Invoke(() => { - installingLabel.Content = "Webview2 install completed"; - Activate(); - - if (sender.exitCode != 0) { - var message = $"Webview2 install FAILED with code {sender.exitCode}. Try again."; - MessageBox.Show(message, "Install failed"); - } - - // Reopen window - var window = new MainWindow(); - window.Show(); - Close(); - }); - } - - private void SaveWindowState() { - try { - Properties.Settings.Default.WindowPosition = new System.Drawing.Point( - Convert.ToInt32(RestoreBounds.Location.X), - Convert.ToInt32(RestoreBounds.Location.Y)); - - Properties.Settings.Default.WindowSize = new System.Drawing.Size( - Convert.ToInt32(RestoreBounds.Size.Width), - Convert.ToInt32(RestoreBounds.Size.Height)); - - Properties.Settings.Default.WindowMaximized = (WindowState == WindowState.Maximized); - Properties.Settings.Default.Save(); - } catch { - // Ignore errors, e.g. overflow - } - } - - private void RestoreWindowsState() { - this.Left = Properties.Settings.Default.WindowPosition.X; - this.Top = Properties.Settings.Default.WindowPosition.Y; - this.Width = Math.Max(300, Properties.Settings.Default.WindowSize.Width); - this.Height = Math.Max(200, Properties.Settings.Default.WindowSize.Height); - - if (Properties.Settings.Default.WindowMaximized) { - WindowState = WindowState.Maximized; - } - } - - private void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e) { - SaveWindowState(); - } - - async void InitializeWebView() { - string version = GetWebView2Version(); - var isAltKeyPressed = (Keyboard.IsKeyDown(Key.LeftAlt) || Keyboard.IsKeyDown(Key.RightAlt)); - if (version == "" || isAltKeyPressed) { - PromptToInstallWebview2(); - return; - } - - this.Title = $"Focalboard (port {port} WebView {version})"; - - // must create a data folder if running out of a secured folder that can't write like Program Files - var env = await CoreWebView2Environment.CreateAsync( - userDataFolder: Path.Combine(Path.GetTempPath(), "Focalboard") - ); - await webView.EnsureCoreWebView2Async(env); - - webView.ContentLoading += WebView_ContentLoading; - - var url = String.Format("http://localhost:{0}", port); - webView.Source = new Uri(url); - } - - private static string GetWebView2Version() { - try { - return CoreWebView2Environment.GetAvailableBrowserVersionString(); - } catch (Exception) { return ""; } - } - - private void WebView_ContentLoading(object sender, CoreWebView2ContentLoadingEventArgs e) { - // Set focalboardSessionId - string script = $"localStorage.setItem('focalboardSessionId', '{sessionToken}');"; - webView.ExecuteScriptAsync(script); - } - } + /// + /// Interaction logic for MainWindow.xaml + /// + public partial class MainWindow : Window { + private int port { + get { return ((App)Application.Current).port; } + } + + private string sessionToken { + get { return ((App)Application.Current).sessionToken; } + } + + public MainWindow() { + Debug.WriteLine($"MainWindow()"); + + InitializeComponent(); + + RestoreWindowsState(); + + this.Loaded += MainWindow_Loaded; + this.Closing += MainWindow_Closing; + webView.WebMessageReceived += WebView_WebMessageReceived; + + InitializeWebView(); + } + + private void WebView_WebMessageReceived(object sender, CoreWebView2WebMessageReceivedEventArgs e) { + var message = e.WebMessageAsJson; + SaveWebAppSettingsBlob(message); + } + + private static void SaveWebAppSettingsBlob(string message) { + WebMessage webMessage; + try { + webMessage = JsonSerializer.Deserialize(message); + } catch (Exception) { + return; + } + switch (webMessage.type) { + case "didChangeUserSettings": + Properties.Settings.Default.WebAppSettingsBlob = webMessage.settingsBlob; + Properties.Settings.Default.Save(); + break; + case "didImportUserSettings": + case "didNotImportUserSettings": + default: + break; + } + } + + private void MainWindow_Loaded(object sender, RoutedEventArgs e) { + Activate(); + } + + private void PromptToInstallWebview2() { + var dialogResult = MessageBox.Show( + "Focalboard requires the WebView2 runtime to be downloaded and installed. Install now?", + "Focalboard", + MessageBoxButton.YesNo, + MessageBoxImage.Information, + MessageBoxResult.OK, + MessageBoxOptions.DefaultDesktopOnly); + + if (dialogResult == MessageBoxResult.Yes) { + installingLabel.Visibility = Visibility.Visible; + webView.Visibility = Visibility.Collapsed; + + var installer = new Webview2Installer(); + installer.InstallProgress += Installer_InstallProgress; + installer.InstallCompleted += Installer_InstallCompleted; + installer.DownloadAndInstall(); + } + } + + private void Installer_InstallProgress(Webview2Installer sender, EventArgs e) { + Application.Current.Dispatcher.Invoke(() => { + if (sender.downloadProgress < 100) { + installingLabel.Content = $"Downloading Webview2: {sender.downloadProgress}%"; + } else { + installingLabel.Content = "Installing Webview2..."; + } + }); + } + + private void Installer_InstallCompleted(Webview2Installer sender, EventArgs e) { + Application.Current.Dispatcher.Invoke(() => { + installingLabel.Content = "Webview2 install completed"; + Activate(); + + if (sender.exitCode != 0) { + var message = $"Webview2 install FAILED with code {sender.exitCode}. Try again."; + MessageBox.Show(message, "Install failed"); + } + + // Reopen window + var window = new MainWindow(); + window.Show(); + Close(); + }); + } + + private void SaveWindowState() { + try { + Properties.Settings.Default.WindowPosition = new System.Drawing.Point( + Convert.ToInt32(RestoreBounds.Location.X), + Convert.ToInt32(RestoreBounds.Location.Y)); + + Properties.Settings.Default.WindowSize = new System.Drawing.Size( + Convert.ToInt32(RestoreBounds.Size.Width), + Convert.ToInt32(RestoreBounds.Size.Height)); + + Properties.Settings.Default.WindowMaximized = (WindowState == WindowState.Maximized); + Properties.Settings.Default.Save(); + } catch { + // Ignore errors, e.g. overflow + } + } + + private void RestoreWindowsState() { + this.Left = Properties.Settings.Default.WindowPosition.X; + this.Top = Properties.Settings.Default.WindowPosition.Y; + this.Width = Math.Max(300, Properties.Settings.Default.WindowSize.Width); + this.Height = Math.Max(200, Properties.Settings.Default.WindowSize.Height); + + if (Properties.Settings.Default.WindowMaximized) { + WindowState = WindowState.Maximized; + } + } + + private void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e) { + SaveWindowState(); + } + + async void InitializeWebView() { + string version = GetWebView2Version(); + var isAltKeyPressed = (Keyboard.IsKeyDown(Key.LeftAlt) || Keyboard.IsKeyDown(Key.RightAlt)); + if (version == "" || isAltKeyPressed) { + PromptToInstallWebview2(); + return; + } + + this.Title = $"Focalboard (port {port} WebView {version})"; + + // must create a data folder if running out of a secured folder that can't write like Program Files + var env = await CoreWebView2Environment.CreateAsync( + userDataFolder: Path.Combine(Path.GetTempPath(), "Focalboard") + ); + await webView.EnsureCoreWebView2Async(env); + + webView.ContentLoading += WebView_ContentLoading; + + var url = String.Format("http://localhost:{0}", port); + webView.Source = new Uri(url); + } + + private static string GetWebView2Version() { + try { + return CoreWebView2Environment.GetAvailableBrowserVersionString(); + } catch (Exception) { return ""; } + } + + private void WebView_ContentLoading(object sender, CoreWebView2ContentLoadingEventArgs e) { + // Set focalboardSessionId + string script = $"localStorage.setItem('focalboardSessionId', '{sessionToken}');"; + webView.ExecuteScriptAsync(script); + + // Set settings blob + string settingsBlob = Properties.Settings.Default.WebAppSettingsBlob; + script = $"const NativeApp = {{ settingsBlob: \"{settingsBlob}\" }}"; + webView.ExecuteScriptAsync(script); + } + } } diff --git a/win-wpf/Focalboard/Properties/Settings.Designer.cs b/win-wpf/Focalboard/Properties/Settings.Designer.cs index 96e863c8077..6a16cfa9a7a 100644 --- a/win-wpf/Focalboard/Properties/Settings.Designer.cs +++ b/win-wpf/Focalboard/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace Focalboard.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.7.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -58,5 +58,17 @@ public bool WindowMaximized { this["WindowMaximized"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string WebAppSettingsBlob { + get { + return ((string)(this["WebAppSettingsBlob"])); + } + set { + this["WebAppSettingsBlob"] = value; + } + } } } diff --git a/win-wpf/Focalboard/Properties/Settings.settings b/win-wpf/Focalboard/Properties/Settings.settings index 3ae816362e8..4c2d3a079d3 100644 --- a/win-wpf/Focalboard/Properties/Settings.settings +++ b/win-wpf/Focalboard/Properties/Settings.settings @@ -11,5 +11,8 @@ False + + + \ No newline at end of file diff --git a/win-wpf/Focalboard/WebMessage.cs b/win-wpf/Focalboard/WebMessage.cs new file mode 100644 index 00000000000..b1722225539 --- /dev/null +++ b/win-wpf/Focalboard/WebMessage.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Focalboard { + internal class WebMessage { + public string type { get; set; } + public string settingsBlob { get; set; } + public string key { get; set; } + } +} diff --git a/win-wpf/Focalboard/packages.config b/win-wpf/Focalboard/packages.config index 84941d6bac9..c91cbcaa08d 100644 --- a/win-wpf/Focalboard/packages.config +++ b/win-wpf/Focalboard/packages.config @@ -1,4 +1,13 @@  + + + + + + + + + \ No newline at end of file From cd5233cdc53bb480fc40c538d5f63f1cee11619c Mon Sep 17 00:00:00 2001 From: Jimmy Neville Date: Tue, 31 Oct 2023 10:59:54 -0400 Subject: [PATCH 19/24] Add import csv feature --- import/csv/.gitignore | 1 + import/csv/README.md | 16 + import/csv/importCsv.ts | 171 ++++ import/csv/package-lock.json | 1796 ++++++++++++++++++++++++++++++++++ import/csv/package.json | 24 + import/csv/tsconfig.json | 27 + import/csv/utils.ts | 19 + 7 files changed, 2054 insertions(+) create mode 100644 import/csv/.gitignore create mode 100644 import/csv/README.md create mode 100644 import/csv/importCsv.ts create mode 100644 import/csv/package-lock.json create mode 100644 import/csv/package.json create mode 100644 import/csv/tsconfig.json create mode 100644 import/csv/utils.ts diff --git a/import/csv/.gitignore b/import/csv/.gitignore new file mode 100644 index 00000000000..9daeafb9864 --- /dev/null +++ b/import/csv/.gitignore @@ -0,0 +1 @@ +test diff --git a/import/csv/README.md b/import/csv/README.md new file mode 100644 index 00000000000..1c24277d57a --- /dev/null +++ b/import/csv/README.md @@ -0,0 +1,16 @@ +# CSV importer + +This node app converts a CSV into a Focalboard archive. To use: +1. Run `npm install` from within `focalboard/webapp` +2. Run `npm install` from within `focalboard/import/csv` +3. Run `npx ts-node importCsv.ts -i -o archive.boardarchive` + - If the csv was exported by testrails, pass `-t true` into the command line arguments +4. In Focalboard, click `Settings`, then `Import archive` and select `archive.boardarchive` + +## Import scope + +Currently, the script imports all cards from a single board, including their properties and markdown content. + +The script currently imports all card properties as a Select type. You can change the type after importing into Focalboard. + +[Contribute code](https://mattermost.github.io/focalboard/) to expand this. diff --git a/import/csv/importCsv.ts b/import/csv/importCsv.ts new file mode 100644 index 00000000000..6afe3d89f27 --- /dev/null +++ b/import/csv/importCsv.ts @@ -0,0 +1,171 @@ +import csv from 'csvtojson' +import * as fs from 'fs' +import minimist from 'minimist' +import path from 'path' +import {exit} from 'process' +import {ArchiveUtils} from '../util/archive' +import {Block} from '../../webapp/src/blocks/block' +import {Board} from '../../webapp/src/blocks/board' +import {IPropertyTemplate, createBoard} from '../../webapp/src/blocks/board' +import {createBoardView} from '../../webapp/src/blocks/boardView' +import {createCard} from '../../webapp/src/blocks/card' +import {createTextBlock} from '../../webapp/src/blocks/textBlock' +import {Utils} from './utils' + +(global.window as any) = {} + +const optionColors = [ + 'propColorGray', + 'propColorBrown', + 'propColorOrange', + 'propColorYellow', + 'propColorGreen', + 'propColorBlue', + 'propColorPurple', + 'propColorPink', + 'propColorRed', +] +let optionColorIndex = 0 + +async function main() { + const args: minimist.ParsedArgs = minimist(process.argv.slice(2)) + + const inputFile = args['i'] + const outputFile = args['o'] || 'test/archive.boardarchive' + const testrailFormat = (args['t'] === 'true') || false + + if (!inputFile) { + showHelp() + } + + if (!fs.existsSync(inputFile)){ + console.log(`File not found: ${inputFile}`) + exit(2) + } + + console.log(`InputFile: ${inputFile}`) + const input = await csv().fromFile(inputFile) + console.log(`Read ${input.length} rows.`) + console.log(input) + + const title = path.basename(inputFile, '.csv') + console.log(`Title: ${title}`) + + const [boards, blocks] = convert(input, title, testrailFormat) + const outputData = ArchiveUtils.buildBlockArchive(boards, blocks) + + fs.writeFileSync(outputFile, outputData) + console.log(`Exported to ${outputFile}`) +} + +function convert(input: any[], title: string, testrailFormat: boolean): [Board[], Block[]] { + const boards: Board[] = [] + const blocks: Block[] = [] + + // Board + const board = createBoard() + console.log(`Board: ${title}`) + board.title = title + + // Each column is a card property + const columns = getColumns(input) + columns.forEach(column => { + if(column === "Steps" && testrailFormat) { + return + } else { + const cardProperty: IPropertyTemplate = { + id: Utils.createGuid(), + name: column, + type: 'select', + options: [] + } + board.cardProperties.push(cardProperty) + } + }) + + // Set all column types to select + // TODO: Detect column type + boards.push(board) + + // Board view + const view = createBoardView() + view.title = 'Board View' + view.fields.viewType = 'board' + view.boardId = board.id + view.parentId = board.id + blocks.push(view) + + // Cards + input.forEach(row => { + const keys = Object.keys(row) + console.log(keys) + if (keys.length < 1) { + console.error(`Expected at least one column`) + return blocks + } + const titleKey = keys[0] + const title = row[titleKey] + + console.log(`Card: ${title}`) + + const outCard = createCard() + outCard.title = title + outCard.boardId = board.id + outCard.parentId = board.id + + // Card properties, skip first key which is the title + for (const key of keys.slice(1)) { + const value = row[key] + if(key === "Steps" && testrailFormat) { + const block = createTextBlock() + block.title = value + block.boardId = board.id + block.parentId = outCard.id + blocks.push(block) + + outCard.fields.contentOrder = [block.id] + continue + } + if (!value) { + // Skip empty values + continue + } + + const cardProperty = board.cardProperties.find((o) => o.name === key)! + let option = cardProperty.options.find((o) => o.value === value) + if (!option) { + const color = optionColors[optionColorIndex % optionColors.length] + optionColorIndex += 1 + option = { + id: Utils.createGuid(), + value, + color: color, + } + cardProperty.options.push(option) + } + + outCard.fields.properties[cardProperty.id] = option.id + } + + blocks.push(outCard) + }) + + console.log('') + console.log(`Found ${input.length} card(s).`) + + return [boards, blocks] +} + +function getColumns(input: any[]) { + const row = input[0] + const keys = Object.keys(row) + // The first key (column) is the card title + return keys.slice(1) +} + +function showHelp() { + console.log('import -i -o [output.boardarchive]') + exit(1) +} + +main() diff --git a/import/csv/package-lock.json b/import/csv/package-lock.json new file mode 100644 index 00000000000..be0a4a80ecf --- /dev/null +++ b/import/csv/package-lock.json @@ -0,0 +1,1796 @@ +{ + "name": "csv", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "csv", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "csvtojson": "^2.0.10", + "minimist": "^1.2.8" + }, + "devDependencies": { + "@types/minimist": "^1.2.4", + "@types/node": "^20.8.9", + "@typescript-eslint/eslint-plugin": "^6.9.1", + "@typescript-eslint/parser": "^6.9.1", + "eslint": "^8.52.0", + "ts-node": "^10.9.1", + "typescript": "^5.2.2" + } + }, + "node_modules/@aashutoshrathi/word-wrap": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/@cspotcode/source-map-support": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", + "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", + "dev": true, + "dependencies": { + "@jridgewell/trace-mapping": "0.3.9" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "dev": true, + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", + "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", + "dev": true, + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/js": { + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz", + "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.11.13", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", + "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", + "dev": true, + "dependencies": { + "@humanwhocodes/object-schema": "^2.0.1", + "debug": "^4.1.1", + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", + "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", + "dev": true + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", + "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", + "dev": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", + "dev": true + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", + "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", + "dev": true, + "dependencies": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@tsconfig/node10": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", + "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==", + "dev": true + }, + "node_modules/@tsconfig/node12": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", + "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", + "dev": true + }, + "node_modules/@tsconfig/node14": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", + "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", + "dev": true + }, + "node_modules/@tsconfig/node16": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", + "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", + "dev": true + }, + "node_modules/@types/json-schema": { + "version": "7.0.14", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.14.tgz", + "integrity": "sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==", + "dev": true + }, + "node_modules/@types/minimist": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.4.tgz", + "integrity": "sha512-Kfe/D3hxHTusnPNRbycJE1N77WHDsdS4AjUYIzlDzhDrS47NrwuL3YW4VITxwR7KCVpzwgy4Rbj829KSSQmwXQ==", + "dev": true + }, + "node_modules/@types/node": { + "version": "20.8.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.9.tgz", + "integrity": "sha512-UzykFsT3FhHb1h7yD4CA4YhBHq545JC0YnEz41xkipN88eKQtL6rSgocL5tbAP6Ola9Izm/Aw4Ora8He4x0BHg==", + "dev": true, + "dependencies": { + "undici-types": "~5.26.4" + } + }, + "node_modules/@types/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ==", + "dev": true + }, + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.9.1.tgz", + "integrity": "sha512-w0tiiRc9I4S5XSXXrMHOWgHgxbrBn1Ro+PmiYhSg2ZVdxrAJtQgzU5o2m1BfP6UOn7Vxcc6152vFjQfmZR4xEg==", + "dev": true, + "dependencies": { + "@eslint-community/regexpp": "^4.5.1", + "@typescript-eslint/scope-manager": "6.9.1", + "@typescript-eslint/type-utils": "6.9.1", + "@typescript-eslint/utils": "6.9.1", + "@typescript-eslint/visitor-keys": "6.9.1", + "debug": "^4.3.4", + "graphemer": "^1.4.0", + "ignore": "^5.2.4", + "natural-compare": "^1.4.0", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha", + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/parser": { + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.9.1.tgz", + "integrity": "sha512-C7AK2wn43GSaCUZ9do6Ksgi2g3mwFkMO3Cis96kzmgudoVaKyt62yNzJOktP0HDLb/iO2O0n2lBOzJgr6Q/cyg==", + "dev": true, + "dependencies": { + "@typescript-eslint/scope-manager": "6.9.1", + "@typescript-eslint/types": "6.9.1", + "@typescript-eslint/typescript-estree": "6.9.1", + "@typescript-eslint/visitor-keys": "6.9.1", + "debug": "^4.3.4" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/scope-manager": { + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.9.1.tgz", + "integrity": "sha512-38IxvKB6NAne3g/+MyXMs2Cda/Sz+CEpmm+KLGEM8hx/CvnSRuw51i8ukfwB/B/sESdeTGet1NH1Wj7I0YXswg==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.9.1", + "@typescript-eslint/visitor-keys": "6.9.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils": { + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.9.1.tgz", + "integrity": "sha512-eh2oHaUKCK58qIeYp19F5V5TbpM52680sB4zNSz29VBQPTWIlE/hCj5P5B1AChxECe/fmZlspAWFuRniep1Skg==", + "dev": true, + "dependencies": { + "@typescript-eslint/typescript-estree": "6.9.1", + "@typescript-eslint/utils": "6.9.1", + "debug": "^4.3.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/types": { + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.9.1.tgz", + "integrity": "sha512-BUGslGOb14zUHOUmDB2FfT6SI1CcZEJYfF3qFwBeUrU6srJfzANonwRYHDpLBuzbq3HaoF2XL2hcr01c8f8OaQ==", + "dev": true, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.9.1.tgz", + "integrity": "sha512-U+mUylTHfcqeO7mLWVQ5W/tMLXqVpRv61wm9ZtfE5egz7gtnmqVIw9ryh0mgIlkKk9rZLY3UHygsBSdB9/ftyw==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.9.1", + "@typescript-eslint/visitor-keys": "6.9.1", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/utils": { + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.9.1.tgz", + "integrity": "sha512-L1T0A5nFdQrMVunpZgzqPL6y2wVreSyHhKGZryS6jrEN7bD9NplVAyMryUhXsQ4TWLnZmxc2ekar/lSGIlprCA==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@types/json-schema": "^7.0.12", + "@types/semver": "^7.5.0", + "@typescript-eslint/scope-manager": "6.9.1", + "@typescript-eslint/types": "6.9.1", + "@typescript-eslint/typescript-estree": "6.9.1", + "semver": "^7.5.4" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.9.1.tgz", + "integrity": "sha512-MUaPUe/QRLEffARsmNfmpghuQkW436DvESW+h+M52w0coICHRfD6Np9/K6PdACwnrq1HmuLl+cSPZaJmeVPkSw==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.9.1", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, + "node_modules/acorn": { + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", + "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/acorn-walk": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", + "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "dev": true + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "node_modules/bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, + "node_modules/create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", + "dev": true + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/csvtojson": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/csvtojson/-/csvtojson-2.0.10.tgz", + "integrity": "sha512-lUWFxGKyhraKCW8Qghz6Z0f2l/PqB1W3AO0HKJzGIQ5JRSlR651ekJDiGJbBT4sRNNv5ddnSGVEnsxP9XRCVpQ==", + "dependencies": { + "bluebird": "^3.5.1", + "lodash": "^4.17.3", + "strip-bom": "^2.0.0" + }, + "bin": { + "csvtojson": "bin/csvtojson" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true + }, + "node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint": { + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz", + "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.2", + "@eslint/js": "8.52.0", + "@humanwhocodes/config-array": "^0.11.13", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, + "dependencies": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esquery": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", + "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", + "dev": true, + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, + "node_modules/fast-glob": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", + "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true + }, + "node_modules/fastq": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", + "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", + "dev": true, + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat-cache": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz", + "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==", + "dev": true, + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/flatted": { + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", + "dev": true + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/globals": { + "version": "13.23.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", + "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", + "dev": true, + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dev": true, + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/ignore": { + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", + "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dev": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==" + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true + }, + "node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dev": true, + "dependencies": { + "braces": "^3.0.2", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/optionator": { + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", + "dev": true, + "dependencies": { + "@aashutoshrathi/word-wrap": "^1.2.3", + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==", + "dependencies": { + "is-utf8": "^0.2.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/ts-api-utils": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz", + "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==", + "dev": true, + "engines": { + "node": ">=16.13.0" + }, + "peerDependencies": { + "typescript": ">=4.2.0" + } + }, + "node_modules/ts-node": { + "version": "10.9.1", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", + "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", + "dev": true, + "dependencies": { + "@cspotcode/source-map-support": "^0.8.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "v8-compile-cache-lib": "^3.0.1", + "yn": "3.1.1" + }, + "bin": { + "ts-node": "dist/bin.js", + "ts-node-cwd": "dist/bin-cwd.js", + "ts-node-esm": "dist/bin-esm.js", + "ts-node-script": "dist/bin-script.js", + "ts-node-transpile-only": "dist/bin-transpile.js", + "ts-script": "dist/bin-script-deprecated.js" + }, + "peerDependencies": { + "@swc/core": ">=1.2.50", + "@swc/wasm": ">=1.2.50", + "@types/node": "*", + "typescript": ">=2.7" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "@swc/wasm": { + "optional": true + } + } + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typescript": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/v8-compile-cache-lib": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", + "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", + "dev": true + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, + "node_modules/yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } +} diff --git a/import/csv/package.json b/import/csv/package.json new file mode 100644 index 00000000000..e6011c10429 --- /dev/null +++ b/import/csv/package.json @@ -0,0 +1,24 @@ +{ + "name": "csv", + "version": "1.0.0", + "description": "", + "main": "importCsv.ts", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "ISC", + "devDependencies": { + "@types/minimist": "^1.2.4", + "@types/node": "^20.8.9", + "@typescript-eslint/eslint-plugin": "^6.9.1", + "@typescript-eslint/parser": "^6.9.1", + "eslint": "^8.52.0", + "ts-node": "^10.9.1", + "typescript": "^5.2.2" + }, + "dependencies": { + "csvtojson": "^2.0.10", + "minimist": "^1.2.8" + } +} diff --git a/import/csv/tsconfig.json b/import/csv/tsconfig.json new file mode 100644 index 00000000000..20b3965156f --- /dev/null +++ b/import/csv/tsconfig.json @@ -0,0 +1,27 @@ +{ + "compilerOptions": { + "jsx": "react", + "target": "es2019", + "module": "commonjs", + "esModuleInterop": true, + "noImplicitAny": true, + "strict": true, + "strictNullChecks": true, + "forceConsistentCasingInFileNames": true, + "sourceMap": true, + "allowJs": true, + "resolveJsonModule": true, + "incremental": false, + "outDir": "./dist", + "moduleResolution": "node" + }, + "include": [ + "." + ], + "exclude": [ + ".git", + "**/node_modules/*", + "dist", + "pack" + ] +} diff --git a/import/csv/utils.ts b/import/csv/utils.ts new file mode 100644 index 00000000000..db782bd6229 --- /dev/null +++ b/import/csv/utils.ts @@ -0,0 +1,19 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. +import * as crypto from 'crypto' + +class Utils { + static createGuid(): string { + function randomDigit() { + if (crypto && crypto.randomBytes) { + const rands = crypto.randomBytes(1) + return (rands[0] % 16).toString(16) + } + + return (Math.floor((Math.random() * 16))).toString(16) + } + return 'xxxxxxxx-xxxx-4xxx-8xxx-xxxxxxxxxxxx'.replace(/x/g, randomDigit) + } +} + +export { Utils } From 302e13462cb61a30a17479872965ae7841f6654c Mon Sep 17 00:00:00 2001 From: Bhasher Date: Tue, 31 Oct 2023 16:38:20 +0100 Subject: [PATCH 20/24] Standalone PWA --- webapp/html-templates/page.ejs | 2 ++ webapp/static/manifest.json | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 webapp/static/manifest.json diff --git a/webapp/html-templates/page.ejs b/webapp/html-templates/page.ejs index 28b48991bbb..617d0913c75 100644 --- a/webapp/html-templates/page.ejs +++ b/webapp/html-templates/page.ejs @@ -4,6 +4,8 @@ + + <%= htmlWebpackPlugin.options.title %> diff --git a/webapp/static/manifest.json b/webapp/static/manifest.json new file mode 100644 index 00000000000..61ba77b1065 --- /dev/null +++ b/webapp/static/manifest.json @@ -0,0 +1,10 @@ +{ + "name": "Focalboard", + "display": "standalone", + "icons": [ + { + "src": "/static/favicon.svg", + "sizes": "any" + } + ] +} From 2186710f4750909c707f7d332f4c1917244440b4 Mon Sep 17 00:00:00 2001 From: alemon0 <74633538+alemon0@users.noreply.github.com> Date: Thu, 7 Dec 2023 16:53:03 +0800 Subject: [PATCH 21/24] Update blocks.go table name and column name error. change FileInfo to file_info, DeleteAt to delete_at --- server/services/store/sqlstore/blocks.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/services/store/sqlstore/blocks.go b/server/services/store/sqlstore/blocks.go index c06412c0ffa..664099747d5 100644 --- a/server/services/store/sqlstore/blocks.go +++ b/server/services/store/sqlstore/blocks.go @@ -427,8 +427,8 @@ func (s *SQLStore) deleteBlockAndChildren(db sq.BaseRunner, blockID string, modi if fileID != "" { deleteFileInfoQuery := s.getQueryBuilder(db). - Update("FileInfo"). - Set("DeleteAt", model.GetMillis()). + Update("file_info"). + Set("delete_at", model.GetMillis()). Where(sq.Eq{"id": fileID}) if _, err := deleteFileInfoQuery.Exec(); err != nil { return err From c8b0f75ea1b7af99c4180a6ccede832929da88f2 Mon Sep 17 00:00:00 2001 From: srisri332 Date: Mon, 18 Dec 2023 09:58:21 +0530 Subject: [PATCH 22/24] MM-52722: Fixed error when accessing property on undefined --- .../src/components/live-markdown-plugin/liveMarkdownPlugin.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/components/live-markdown-plugin/liveMarkdownPlugin.ts b/webapp/src/components/live-markdown-plugin/liveMarkdownPlugin.ts index afcb2bd02a9..42b03a89926 100644 --- a/webapp/src/components/live-markdown-plugin/liveMarkdownPlugin.ts +++ b/webapp/src/components/live-markdown-plugin/liveMarkdownPlugin.ts @@ -180,7 +180,7 @@ const maintainInlineStyles = ( // If enter was pressed (or the block was otherwise split) we must maintain // styles in the previous block as well - if (lastChangeType === 'split-block') { + if (lastChangeType === 'split-block' && contentState.getBlockBefore(blockKey) !== undefined) { const newPrevBlock = mapInlineStyles( contentState.getBlockBefore(blockKey)!, inlineStyleStrategies, From c4bcfe8f4a9a440ffe636a823264f37718f408ee Mon Sep 17 00:00:00 2001 From: Leora Date: Thu, 9 May 2024 10:52:25 -0500 Subject: [PATCH 23/24] Revert "docs: noteable > notable in contribution guide" This reverts commit 69793bbb85c35a0d459fec1da77cc736ac8b2792. --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6a7bb051b49..b8e3331f499 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,7 +4,7 @@ Thank you for your interest in contributing! Please read the [Focalboard Contrib When you submit a pull request, it goes through a code review process outlined [here](https://developers.mattermost.com/contribute/getting-started/code-review/). -After a notable bug fix or improvement is merged, submit a pull request to the [CHANGELOG](CHANGELOG.md) under the next release section. +After a noteable bug fix or improvement is merged, submit a pull request to the [CHANGELOG](CHANGELOG.md) under the next release section. ## Bug Reports From 798a5fee788f3acbf68532c51f8fc81572abc1dd Mon Sep 17 00:00:00 2001 From: Leora Date: Thu, 9 May 2024 15:30:48 -0500 Subject: [PATCH 24/24] Version Bump | 7.13.0 --- mattermost-plugin/plugin.json | 2 +- mattermost-plugin/server/manifest.go | 2 +- server/model/version.go | 1 + webapp/package-lock.json | 4 ++-- webapp/package.json | 2 +- .../__snapshots__/globalHeader.test.tsx.snap | 2 +- .../__snapshots__/sidebar.test.tsx.snap | 20 +++++++++---------- webapp/src/constants.ts | 4 ++-- 8 files changed, 19 insertions(+), 18 deletions(-) diff --git a/mattermost-plugin/plugin.json b/mattermost-plugin/plugin.json index 2b86d0fc79b..beb8288ce7d 100644 --- a/mattermost-plugin/plugin.json +++ b/mattermost-plugin/plugin.json @@ -6,7 +6,7 @@ "support_url": "https://github.com/mattermost/focalboard/issues", "release_notes_url": "https://github.com/mattermost/focalboard/releases", "icon_path": "assets/starter-template-icon.svg", - "version": "7.12.0", + "version": "7.13.0", "min_server_version": "7.2.0", "server": { "executables": { diff --git a/mattermost-plugin/server/manifest.go b/mattermost-plugin/server/manifest.go index f66d9e73fcd..8f17b324c6b 100644 --- a/mattermost-plugin/server/manifest.go +++ b/mattermost-plugin/server/manifest.go @@ -20,7 +20,7 @@ const manifestStr = ` "support_url": "https://github.com/mattermost/focalboard/issues", "release_notes_url": "https://github.com/mattermost/focalboard/releases", "icon_path": "assets/starter-template-icon.svg", - "version": "7.12.0", + "version": "7.13.0", "min_server_version": "7.2.0", "server": { "executables": { diff --git a/server/model/version.go b/server/model/version.go index bbfd8393ed4..725d0af7179 100644 --- a/server/model/version.go +++ b/server/model/version.go @@ -8,6 +8,7 @@ import ( // It should be maintained in chronological order with most current // release at the front of the list. var versions = []string{ + "7.13.0", "7.12.0", "7.11.1", "7.11.0", diff --git a/webapp/package-lock.json b/webapp/package-lock.json index d5acbb97e11..cc55cf01adb 100644 --- a/webapp/package-lock.json +++ b/webapp/package-lock.json @@ -1,12 +1,12 @@ { "name": "focalboard", - "version": "7.12.0", + "version": "7.13.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "focalboard", - "version": "7.12.0", + "version": "7.13.0", "dependencies": { "@draft-js-plugins/editor": "^4.1.2", "@draft-js-plugins/emoji": "^4.6.0", diff --git a/webapp/package.json b/webapp/package.json index b15469a7bea..6eff5ab269e 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,6 +1,6 @@ { "name": "focalboard", - "version": "7.12.0", + "version": "7.13.0", "private": true, "description": "", "scripts": { diff --git a/webapp/src/components/globalHeader/__snapshots__/globalHeader.test.tsx.snap b/webapp/src/components/globalHeader/__snapshots__/globalHeader.test.tsx.snap index 46c6d324aa3..f15812d9a51 100644 --- a/webapp/src/components/globalHeader/__snapshots__/globalHeader.test.tsx.snap +++ b/webapp/src/components/globalHeader/__snapshots__/globalHeader.test.tsx.snap @@ -10,7 +10,7 @@ exports[`components/sidebar/GlobalHeader header menu should match snapshot 1`] = /> diff --git a/webapp/src/components/sidebar/__snapshots__/sidebar.test.tsx.snap b/webapp/src/components/sidebar/__snapshots__/sidebar.test.tsx.snap index fea8481062f..0953323b03b 100644 --- a/webapp/src/components/sidebar/__snapshots__/sidebar.test.tsx.snap +++ b/webapp/src/components/sidebar/__snapshots__/sidebar.test.tsx.snap @@ -51,9 +51,9 @@ exports[`components/sidebarSidebar dont show hidden boards 1`] = ` >
- v7.12.0 + v7.13.0
@@ -252,9 +252,9 @@ exports[`components/sidebarSidebar should assign default category if current boa >
- v7.12.0 + v7.13.0
@@ -508,9 +508,9 @@ exports[`components/sidebarSidebar shouldnt do any category assignment is board >
- v7.12.0 + v7.13.0
@@ -919,9 +919,9 @@ exports[`components/sidebarSidebar sidebar hidden 1`] = ` >
- v7.12.0 + v7.13.0
@@ -1213,9 +1213,9 @@ exports[`components/sidebarSidebar some categories hidden 1`] = ` >
- v7.12.0 + v7.13.0
diff --git a/webapp/src/constants.ts b/webapp/src/constants.ts index 9f8504723e8..cbc883f828e 100644 --- a/webapp/src/constants.ts +++ b/webapp/src/constants.ts @@ -37,8 +37,8 @@ class Constants { static readonly titleColumnId = '__title' static readonly badgesColumnId = '__badges' - static readonly versionString = '7.12.0' - static readonly versionDisplayString = 'May 2023' + static readonly versionString = '7.13.0' + static readonly versionDisplayString = 'May 2024' static readonly archiveHelpPage = 'https://docs.mattermost.com/boards/migrate-to-boards.html' static readonly imports = [