π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
fix: moved dropdowns to chart component + added pending icon (#5824)
Akshita Goyal4b450f8173ab
diff --git a/packages/ui/src/icons/index.ts b/packages/ui/src/icons/index.tsindex 69436c2e83..e857dc1a49 100644--- a/packages/ui/src/icons/index.ts+++ b/packages/ui/src/icons/index.ts@@ -31,3 +31,4 @@ export * from "./favorite-folder-icon";export * from "./planned-icon";export * from "./in-progress-icon";export * from "./done-icon";+export * from "./pending-icon";diff --git a/packages/ui/src/icons/pending-icon.tsx b/packages/ui/src/icons/pending-icon.tsxnew file mode 100644index 0000000000..5269a22e2b--- /dev/null+++ b/packages/ui/src/icons/pending-icon.tsx@@ -0,0 +1,27 @@+import * as React from "react";++import { ISvgIcons } from "./type";++export const PendingState: React.FC<ISvgIcons> = ({ width = "10", height = "11", className, color = "#455068" }) => (+ <svg+ width={width}+ height={height}+ viewBox="0 0 24 24"+ fill="none"+ xmlns="http://www.w3.org/2000/svg"+ className={className}+ >+ <path+ fill-rule="evenodd"+ clip-rule="evenodd"+ d="M12 3C7.02944 3 3 7.02944 3 12C3 16.9706 7.02944 21 12 21C16.9706 21 21 16.9706 21 12C21 7.02944 16.9706 3 12 3ZM1 12C1 5.92487 5.92487 1 12 1C18.0751 1 23 5.92487 23 12C23 18.0751 18.0751 23 12 23C5.92487 23 1 18.0751 1 12Z"+ fill={color}+ />+ <path+ fill-rule="evenodd"+ clip-rule="evenodd"+ d="M12 5C12.5523 5 13 5.44772 13 6V11.382L16.4472 13.1056C16.9412 13.3526 17.1414 13.9532 16.8944 14.4472C16.6474 14.9412 16.0468 15.1414 15.5528 14.8944L11.5528 12.8944C11.214 12.725 11 12.3788 11 12V6C11 5.44772 11.4477 5 12 5Z"+ fill={color}+ />+ </svg>+);diff --git a/web/app/[workspaceSlug]/(projects)/active-cycles/header.tsx b/web/app/[workspaceSlug]/(projects)/active-cycles/header.tsxindex 72dae40b1e..4edf41bbdb 100644--- a/web/app/[workspaceSlug]/(projects)/active-cycles/header.tsx+++ b/web/app/[workspaceSlug]/(projects)/active-cycles/header.tsx@@ -16,7 +16,7 @@ export const WorkspaceActiveCycleHeader = observer(() => (type="text"link={<BreadcrumbLink- label="Active Cycles"+ label="Active cycles"icon={<ContrastIcon className="h-4 w-4 text-custom-text-300 rotate-180" />}/>}diff --git a/web/ce/components/cycles/analytics-sidebar/base.tsx b/web/ce/components/cycles/analytics-sidebar/base.tsxindex 94609bc1f6..34d61efaa5 100644--- a/web/ce/components/cycles/analytics-sidebar/base.tsx+++ b/web/ce/components/cycles/analytics-sidebar/base.tsx@@ -2,14 +2,16 @@import { FC, Fragment } from "react";import { observer } from "mobx-react";// plane ui-import { Loader } from "@plane/ui";+import { TCycleEstimateType } from "@plane/types";+import { EEstimateSystem } from "@plane/types/src/enums";+import { CustomSelect, Loader } from "@plane/ui";// componentsimport ProgressChart from "@/components/core/sidebar/progress-chart";-import { validateCycleSnapshot } from "@/components/cycles";+import { cycleEstimateOptions, validateCycleSnapshot } from "@/components/cycles";// helpersimport { getDate } from "@/helpers/date-time.helper";// hooks-import { useCycle } from "@/hooks/store";+import { useCycle, useProjectEstimates } from "@/hooks/store";type ProgressChartProps = {workspaceSlug: string;@@ -20,7 +22,9 @@ export const SidebarChart: FC<ProgressChartProps> = observer((props) => {const { workspaceSlug, projectId, cycleId } = props;// hooks- const { getEstimateTypeByCycleId, getCycleById } = useCycle();+ const { getEstimateTypeByCycleId, getCycleById, fetchCycleDetails, fetchArchivedCycleDetails, setEstimateType } =+ useCycle();+ const { currentActiveEstimateId, areEstimateEnabledByProjectId, estimateById } = useProjectEstimates();// derived dataconst cycleDetails = validateCycleSnapshot(getCycleById(cycleId));@@ -29,7 +33,10 @@ export const SidebarChart: FC<ProgressChartProps> = observer((props) => {const totalEstimatePoints = cycleDetails?.total_estimate_points || 0;const totalIssues = cycleDetails?.total_issues || 0;const estimateType = getEstimateTypeByCycleId(cycleId);-+ const isCurrentProjectEstimateEnabled = Boolean(projectId && areEstimateEnabledByProjectId(projectId));+ const estimateDetails =+ isCurrentProjectEstimateEnabled && currentActiveEstimateId && estimateById(currentActiveEstimateId);+ const isCurrentEstimateTypeIsPoints = estimateDetails && estimateDetails?.type === EEstimateSystem.POINTS;const chartDistributionData =estimateType === "points" ? cycleDetails?.estimate_distribution : cycleDetails?.distribution || undefined;@@ -37,33 +44,71 @@ export const SidebarChart: FC<ProgressChartProps> = observer((props) => {if (!workspaceSlug || !projectId || !cycleId) return null;+ const isArchived = !!cycleDetails?.archived_at;++ // handlers+ const onChange = async (value: TCycleEstimateType) => {+ setEstimateType(cycleId, value);+ if (!workspaceSlug || !projectId || !cycleId) return;+ try {+ if (isArchived) {+ await fetchArchivedCycleDetails(workspaceSlug, projectId, cycleId);+ } else {+ await fetchCycleDetails(workspaceSlug, projectId, cycleId);+ }+ } catch (err) {+ console.error(err);+ setEstimateType(cycleId, estimateType);+ }+ };return (- <div>- <div className="relative flex items-center gap-2">- <div className="flex items-center justify-center gap-1 text-xs">- <span className="h-2.5 w-2.5 rounded-full bg-[#A9BBD0]" />- <span>Ideal</span>+ <>+ {isCurrentEstimateTypeIsPoints && (+ <div className="relative flex items-center justify-between gap-2 pt-4">+ <CustomSelect+ value={estimateType}+ label={<span>{cycleEstimateOptions.find((v) => v.value === estimateType)?.label ?? "None"}</span>}+ onChange={onChange}+ maxHeight="lg"+ buttonClassName="border-none rounded text-sm font-medium capitalize"+ >+ {cycleEstimateOptions.map((item) => (+ <CustomSelect.Option key={item.value} value={item.value} className="capitalize">+ {item.label}+ </CustomSelect.Option>+ ))}+ </CustomSelect></div>- <div className="flex items-center justify-center gap-1 text-xs">- <span className="h-2.5 w-2.5 rounded-full bg-[#4C8FFF]" />- <span>Current</span>+ )}+ <div className="py-4">+ <div>+ <div className="relative flex items-center gap-2">+ <div className="flex items-center justify-center gap-1 text-xs">+ <span className="h-2.5 w-2.5 rounded-full bg-[#A9BBD0]" />+ <span>Ideal</span>+ </div>+ <div className="flex items-center justify-center gap-1 text-xs">+ <span className="h-2.5 w-2.5 rounded-full bg-[#4C8FFF]" />+ <span>Current</span>+ </div>+ </div>+ {cycleStartDate && cycleEndDate && completionChartDistributionData ? (+ <Fragment>+ <ProgressChart+ distribution={completionChartDistributionData}+ startDate={cycleStartDate}+ endDate={cycleEndDate}+ totalIssues={estimateType === "points" ? totalEstimatePoints : totalIssues}+ plotTitle={estimateType === "points" ? "points" : "issues"}+ />+ </Fragment>+ ) : (+ <Loader className="w-full h-[160px] mt-4">+ <Loader.Item width="100%" height="100%" />+ </Loader>+ )}</div></div>- {cycleStartDate && cycleEndDate && completionChartDistributionData ? (- <Fragment>- <ProgressChart- distribution={completionChartDistributionData}- startDate={cycleStartDate}- endDate={cycleEndDate}- totalIssues={estimateType === "points" ? totalEstimatePoints : totalIssues}- plotTitle={estimateType === "points" ? "points" : "issues"}- />- </Fragment>- ) : (- <Loader className="w-full h-[160px] mt-4">- <Loader.Item width="100%" height="100%" />- </Loader>- )}- </div>+ </>);});diff --git a/web/core/components/cycles/analytics-sidebar/issue-progress.tsx b/web/core/components/cycles/analytics-sidebar/issue-progress.tsxindex 55178ed217..d9725d1d66 100644--- a/web/core/components/cycles/analytics-sidebar/issue-progress.tsx+++ b/web/core/components/cycles/analytics-sidebar/issue-progress.tsx@@ -7,8 +7,7 @@ import { observer } from "mobx-react";import { useSearchParams } from "next/navigation";import { ChevronUp, ChevronDown } from "lucide-react";import { Disclosure, Transition } from "@headlessui/react";-import { ICycle, IIssueFilterOptions, TCycleEstimateType, TCyclePlotType, TProgressSnapshot } from "@plane/types";-import { CustomSelect } from "@plane/ui";+import { ICycle, IIssueFilterOptions, TCyclePlotType, TProgressSnapshot } from "@plane/types";// componentsimport { CycleProgressStats } from "@/components/cycles";// constants@@ -25,6 +24,19 @@ type TCycleAnalyticsProgress = {projectId: string;cycleId: string;};+type Options = {+ value: string;+ label: string;+};++export const cycleEstimateOptions: Options[] = [+ { value: "issues", label: "Issues" },+ { value: "points", label: "Points" },+];+export const cycleChartOptions: Options[] = [+ { value: "burndown", label: "Burn-down" },+ { value: "burnup", label: "Burn-up" },+];export const validateCycleSnapshot = (cycleDetails: ICycle | null): ICycle | null => {if (!cycleDetails || cycleDetails === null) return cycleDetails;@@ -41,32 +53,13 @@ export const validateCycleSnapshot = (cycleDetails: ICycle | null): ICycle | nulreturn updatedCycleDetails;};-type options = {- value: string;- label: string;-};-export const cycleChartOptions: options[] = [- { value: "burndown", label: "Burn-down" },- { value: "burnup", label: "Burn-up" },-];-export const cycleEstimateOptions: options[] = [- { value: "issues", label: "issues" },- { value: "points", label: "points" },-];export const CycleAnalyticsProgress: FC<TCycleAnalyticsProgress> = observer((props) => {// propsconst { workspaceSlug, projectId, cycleId } = props;// routerconst searchParams = useSearchParams();const peekCycle = searchParams.get("peekCycle") || undefined;- const {- getPlotTypeByCycleId,- getEstimateTypeByCycleId,- getCycleById,- fetchCycleDetails,- fetchArchivedCycleDetails,- setEstimateType,- } = useCycle();+ const { getPlotTypeByCycleId, getEstimateTypeByCycleId, getCycleById } = useCycle();const {issuesFilter: { issueFilters, updateFilters },} = useIssues(EIssuesStoreType.CYCLE);@@ -76,21 +69,9 @@ export const CycleAnalyticsProgress: FC<TCycleAnalyticsProgress> = observer((proconst plotType: TCyclePlotType = getPlotTypeByCycleId(cycleId);const estimateType = getEstimateTypeByCycleId(cycleId);- const completedIssues = cycleDetails?.completed_issues || 0;const totalIssues = cycleDetails?.total_issues || 0;- const completedEstimatePoints = cycleDetails?.completed_estimate_points || 0;const totalEstimatePoints = cycleDetails?.total_estimate_points || 0;- const progressHeaderPercentage = cycleDetails- ? estimateType === "points"- ? completedEstimatePoints != 0 && totalEstimatePoints != 0- ? Math.round((completedEstimatePoints / totalEstimatePoints) * 100)- : 0- : completedIssues != 0 && completedIssues != 0- ? Math.round((completedIssues / totalIssues) * 100)- : 0- : 0;-const chartDistributionData =estimateType === "points" ? cycleDetails?.estimate_distribution : cycleDetails?.distribution || undefined;@@ -115,23 +96,6 @@ export const CycleAnalyticsProgress: FC<TCycleAnalyticsProgress> = observer((proconst isCycleStartDateValid = cycleStartDate && cycleStartDate <= new Date();const isCycleEndDateValid = cycleStartDate && cycleEndDate && cycleEndDate >= cycleStartDate;const isCycleDateValid = isCycleStartDateValid && isCycleEndDateValid;- const isArchived = !!cycleDetails?.archived_at;-- // handlers- const onChange = async (value: TCycleEstimateType) => {- setEstimateType(cycleId, value);- if (!workspaceSlug || !projectId || !cycleId) return;- try {- if (isArchived) {- await fetchArchivedCycleDetails(workspaceSlug, projectId, cycleId);- } else {- await fetchCycleDetails(workspaceSlug, projectId, cycleId);- }- } catch (err) {- console.error(err);- setEstimateType(cycleId, estimateType);- }- };const handleFiltersUpdate = useCallback((key: keyof IIssueFilterOptions, value: string | string[]) => {@@ -192,30 +156,7 @@ export const CycleAnalyticsProgress: FC<TCycleAnalyticsProgress> = observer((pro<Transition show={open}><Disclosure.Panel className="flex flex-col">- <div className="relative flex items-center justify-between gap-2 pt-4">- <CustomSelect- value={estimateType}- label={<span>{cycleEstimateOptions.find((v) => v.value === estimateType)?.label ?? "None"}</span>}- onChange={onChange}- maxHeight="lg"- buttonClassName="border-none rounded text-sm font-medium"- >- {cycleEstimateOptions.map((item) => (- <CustomSelect.Option key={item.value} value={item.value}>- {item.label}- </CustomSelect.Option>- ))}- </CustomSelect>- <div className="flex items-center justify-center gap-2">- <div className="flex items-center gap-1 text-xs">- <span className="text-custom-text-300">Done</span>- <span className="font-semibold text-custom-text-400">{progressHeaderPercentage}%</span>- </div>- </div>- </div>- <div className="py-4">- <SidebarChartRoot workspaceSlug={workspaceSlug} projectId={projectId} cycleId={cycleId} />- </div>+ <SidebarChartRoot workspaceSlug={workspaceSlug} projectId={projectId} cycleId={cycleId} />{/* progress detailed view */}{chartDistributionData && (<div className="w-full border-t border-custom-border-200 py-4">diff --git a/web/core/components/cycles/analytics-sidebar/sidebar-header.tsx b/web/core/components/cycles/analytics-sidebar/sidebar-header.tsxindex 6a654e0535..af645804eb 100644--- a/web/core/components/cycles/analytics-sidebar/sidebar-header.tsx+++ b/web/core/components/cycles/analytics-sidebar/sidebar-header.tsx@@ -240,7 +240,7 @@ export const CycleSidebarHeader: FC<Props> = observer((props) => {<div className="-mt-1"><p>Archive cycle</p><p className="text-xs text-custom-text-400">- Only completed cycle <br /> can be archived.+ Only completed cycles <br /> can be archived.</p></div></div>diff --git a/web/core/components/cycles/list/cycle-list-item-action.tsx b/web/core/components/cycles/list/cycle-list-item-action.tsxindex eab9c50189..989e0436e3 100644--- a/web/core/components/cycles/list/cycle-list-item-action.tsx+++ b/web/core/components/cycles/list/cycle-list-item-action.tsx@@ -211,7 +211,7 @@ export const CycleListItemAction: FC<Props> = observer((props) => {<><buttononClick={openCycleOverview}- className={`z-[1] flex text-custom-primary-200 text-xs gap-1 flex-shrink-0 ${isMobile || isActive ? "flex" : "hidden group-hover:flex"}`}+ className={`z-[1] flex text-custom-primary-200 text-xs gap-1 flex-shrink-0 ${isMobile || (isActive && !searchParams.has("peekCycle")) ? "flex" : "hidden group-hover:flex"}`}><Eye className="h-4 w-4 my-auto text-custom-primary-200" /><span>More details</span>diff --git a/web/core/components/cycles/quick-actions.tsx b/web/core/components/cycles/quick-actions.tsxindex 6d6e9ed150..49f78cb5c0 100644--- a/web/core/components/cycles/quick-actions.tsx+++ b/web/core/components/cycles/quick-actions.tsx@@ -115,7 +115,7 @@ export const CycleQuickActions: React.FC<Props> = observer((props) => {key: "archive",action: handleArchiveCycle,title: "Archive",- description: isCompleted ? undefined : "Only completed cycle can\nbe archived.",+ description: isCompleted ? undefined : "Only completed cycles can\nbe archived.",icon: ArchiveIcon,className: "items-start",iconClassName: "mt-1",diff --git a/yarn.lock b/yarn.lockindex 73129dbc83..99246b4d46 100644--- a/yarn.lock+++ b/yarn.lock@@ -1389,9 +1389,9 @@"@floating-ui/dom" "^1.0.0""@floating-ui/react@^0.26.4":- version "0.26.24"- resolved "https://registry.yarnpkg.com/@floating-ui/react/-/react-0.26.24.tgz#072b9dfeca4e79ef4e3000ef1c28e0ffc86f4ed4"- integrity sha512-2ly0pCkZIGEQUq5H8bBK0XJmc1xIK/RM3tvVzY3GBER7IOD1UgmC2Y2tjj4AuS+TC+vTE1KJv2053290jua0Sw==+ version "0.26.25"+ resolved "https://registry.yarnpkg.com/@floating-ui/react/-/react-0.26.25.tgz#cf4c8a2b89fab1a71712d15e6551df3bfbd2ea1d"+ integrity sha512-hZOmgN0NTOzOuZxI1oIrDu3Gcl8WViIkvPMpB4xdd4QD6xAMtwgwr3VPoiyH/bLtRcS1cDnhxLSD1NsMJmwh/A==dependencies:"@floating-ui/react-dom" "^2.1.2""@floating-ui/utils" "^0.2.8"@@ -6373,7 +6373,7 @@ entities@^2.0.0:resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==-entities@^4.2.0, entities@^4.4.0:+entities@^4.2.0, entities@^4.4.0, entities@^4.5.0:version "4.5.0"resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==@@ -8382,7 +8382,7 @@ levn@^0.4.1:prelude-ls "^1.2.1"type-check "~0.4.0"-lib0@^0.2.42, lib0@^0.2.47, lib0@^0.2.74, lib0@^0.2.85, lib0@^0.2.86, lib0@^0.2.87:+lib0@^0.2.42, lib0@^0.2.47, lib0@^0.2.74, lib0@^0.2.85, lib0@^0.2.87, lib0@^0.2.98:version "0.2.98"resolved "https://registry.yarnpkg.com/lib0/-/lib0-0.2.98.tgz#fe55203b8586512c1837248d5f309d7dfd566f5d"integrity sha512-XteTiNO0qEXqqweWx+b21p/fBnNHUA1NwAtJNJek1oPrewEZs2uiT4gWivHKr9GqCjDPAhchz0UQO8NwU3bBNA==@@ -9491,11 +9491,11 @@ parse-svg-path@^0.1.2:integrity sha512-JyPSBnkTJ0AI8GGJLfMXvKq42cj5c006fnLz6fXy6zfoVjJizi8BNTpu8on8ziI1cKy9d9DGNuY17Ce7wuejpQ==parse5@^7.1.2:- version "7.1.2"- resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32"- integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==+ version "7.2.0"+ resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.2.0.tgz#8a0591ce9b7c5e2027173ab737d4d3fc3d826fab"+ integrity sha512-ZkDsAOcxsUMZ4Lz5fVciOehNcJ+Gb8gTzcA4yl3wnc273BAybYWrQ+Ks/OjCjSEpjvQkDSeZbybK9qj2VHHdGA==dependencies:- entities "^4.4.0"+ entities "^4.5.0"parseurl@~1.3.3:version "1.3.3"@@ -9922,9 +9922,9 @@ posthog-js@^1.131.3:web-vitals "^4.0.1"preact@^10.19.3:- version "10.24.2"- resolved "https://registry.yarnpkg.com/preact/-/preact-10.24.2.tgz#42179771d3b06e7adb884e3f8127ddd3d99b78f6"- integrity sha512-1cSoF0aCC8uaARATfrlz4VCBqE8LwZwRfLgkxJOQwAlQt6ayTmi0D9OF7nXid1POI5SZidFuG9CnlXbDfLqY/Q==+ version "10.24.3"+ resolved "https://registry.yarnpkg.com/preact/-/preact-10.24.3.tgz#086386bd47071e3b45410ef20844c21e23828f64"+ integrity sha512-Z2dPnBnMUfyQfSQ+GBdsGa16hz35YmLmtTLhM169uW944hYL6xzTYkJjC07j+Wosz733pMWx0fgON3JNw1jJQA==prebuild-install@^7.1.1:version "7.1.2"@@ -11790,17 +11790,17 @@ tiptap-markdown@^0.8.9:markdown-it-task-lists "^2.1.1"prosemirror-markdown "^1.11.1"-tldts-core@^6.1.50:- version "6.1.50"- resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-6.1.50.tgz#8f8f87928adde862b8bc8ce6954c463e2dded790"- integrity sha512-na2EcZqmdA2iV9zHV7OHQDxxdciEpxrjbkp+aHmZgnZKHzoElLajP59np5/4+sare9fQBfixgvXKx8ev1d7ytw==+tldts-core@^6.1.51:+ version "6.1.51"+ resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-6.1.51.tgz#abbb005cccc1c469ed7ddf1ec472acd91efda4d0"+ integrity sha512-bu9oCYYWC1iRjx+3UnAjqCsfrWNZV1ghNQf49b3w5xE8J/tNShHTzp5syWJfwGH+pxUgTTLUnzHnfuydW7wmbg==tldts@^6.1.32:- version "6.1.50"- resolved "https://registry.yarnpkg.com/tldts/-/tldts-6.1.50.tgz#3b259a65bb11978a2a3d1b3c37660e542dbf9896"- integrity sha512-q9GOap6q3KCsLMdOjXhWU5jVZ8/1dIib898JBRLsN+tBhENpBDcAVQbE0epADOjw11FhQQy9AcbqKGBQPUfTQA==+ version "6.1.51"+ resolved "https://registry.yarnpkg.com/tldts/-/tldts-6.1.51.tgz#ee5b35a939e733515f8cbfc882791ec87962e12c"+ integrity sha512-33lfQoL0JsDogIbZ8fgRyvv77GnRtwkNE/MOKocwUgPO1WrSfsq7+vQRKxRQZai5zd+zg97Iv9fpFQSzHyWdLA==dependencies:- tldts-core "^6.1.50"+ tldts-core "^6.1.51"to-fast-properties@^2.0.0:version "2.0.0"@@ -12756,9 +12756,9 @@ yaml@^1.10.0:integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==yaml@^2.3.4, yaml@^2.4.2:- version "2.5.1"- resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.5.1.tgz#c9772aacf62cb7494a95b0c4f1fb065b563db130"- integrity sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==+ version "2.6.0"+ resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.6.0.tgz#14059ad9d0b1680d0f04d3a60fe00f3a857303c3"+ integrity sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==yargs-parser@^21.1.1:version "21.1.1"@@ -12779,11 +12779,11 @@ yargs@^17.0.0, yargs@^17.7.2:yargs-parser "^21.1.1"yjs@^13.6.14, yjs@^13.6.15:- version "13.6.19"- resolved "https://registry.yarnpkg.com/yjs/-/yjs-13.6.19.tgz#66999f41254ab65be8c8e71bd767d124ad600909"- integrity sha512-GNKw4mEUn5yWU2QPHRx8jppxmCm9KzbBhB4qJLUJFiiYD0g/tDVgXQ7aPkyh01YO28kbs2J/BEbWBagjuWyejw==+ version "13.6.20"+ resolved "https://registry.yarnpkg.com/yjs/-/yjs-13.6.20.tgz#da878412688f107dc03faa4fc3cff37736fe5dfa"+ integrity sha512-Z2YZI+SYqK7XdWlloI3lhMiKnCdFCVC4PchpdO+mCYwtiTwncjUbnRK9R1JmkNfdmHyDXuWN3ibJAt0wsqTbLQ==dependencies:- lib0 "^0.2.86"+ lib0 "^0.2.98"version "3.1.1"