fix(bi): parsing enum labels of field with alias (#2349)

* fix(bi): parsing enum labels of field with alias

* fix: current collection bug
This commit is contained in:
YANG QIA 2023-07-29 22:35:55 +08:00 committed by GitHub
parent 40c4aab507
commit b8175dbf17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 29 additions and 65 deletions

View File

@ -17,6 +17,7 @@ import React, { createContext, useContext, useMemo, useRef } from 'react';
import { import {
useChartFields, useChartFields,
useCollectionOptions, useCollectionOptions,
useData,
useFieldTypes, useFieldTypes,
useFieldsWithAssociation, useFieldsWithAssociation,
useFormatters, useFormatters,
@ -26,7 +27,7 @@ import {
} from '../hooks'; } from '../hooks';
import { useChartsTranslation } from '../locale'; import { useChartsTranslation } from '../locale';
import { ChartRenderer, ChartRendererContext, useChartTypes, useCharts, useDefaultChartType } from '../renderer'; import { ChartRenderer, ChartRendererContext, useChartTypes, useCharts, useDefaultChartType } from '../renderer';
import { createRendererSchema, getField, getSelectedFields, processData } from '../utils'; import { createRendererSchema, getField, getSelectedFields } from '../utils';
import { getConfigSchema, querySchema, transformSchema } from './schemas/configure'; import { getConfigSchema, querySchema, transformSchema } from './schemas/configure';
const { Paragraph, Text } = Typography; const { Paragraph, Text } = Typography;
@ -409,11 +410,10 @@ ChartConfigure.Transform = function Transform() {
}; };
ChartConfigure.Data = function Data() { ChartConfigure.Data = function Data() {
const { t } = useChartsTranslation();
const { current } = useContext(ChartConfigContext);
const { service } = useContext(ChartRendererContext); const { service } = useContext(ChartRendererContext);
const { current } = useContext(ChartConfigContext);
const fields = useFieldsWithAssociation(); const fields = useFieldsWithAssociation();
const data = processData(fields, service?.data || current?.data || [], { t }); const data = useData(current?.data);
const error = service?.error; const error = service?.error;
return !error ? ( return !error ? (
<div <div

View File

@ -1,14 +1,14 @@
import { ArrayField } from '@formily/core'; import { ArrayField } from '@formily/core';
import { ISchema, Schema } from '@formily/react'; import { ISchema, Schema, useForm } from '@formily/react';
import { useACLRoleContext, useCollectionManager } from '@nocobase/client'; import { useACLRoleContext, useCollectionManager } from '@nocobase/client';
import { useContext } from 'react'; import { useContext } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { ChartConfigContext } from './block/ChartConfigure'; import { ChartConfigContext } from './block/ChartConfigure';
import formatters from './block/formatters'; import formatters from './block/formatters';
import transformers from './block/transformers'; import transformers from './block/transformers';
import { lang } from './locale'; import { lang, useChartsTranslation } from './locale';
import { ChartRendererProps } from './renderer'; import { ChartRendererContext, ChartRendererProps } from './renderer';
import { getField, getSelectedFields, parseField } from './utils'; import { getField, getSelectedFields, parseField, processData } from './utils';
export type FieldOption = { export type FieldOption = {
value: string; value: string;
@ -237,3 +237,12 @@ export const useOrderReaction = (defaultOptions: any[], fields: FieldOption[]) =
}, []); }, []);
field.setValue(newOrders); field.setValue(newOrders);
}; };
export const useData = (data?: any[], collection?: string) => {
const { t } = useChartsTranslation();
const { service, query } = useContext(ChartRendererContext);
const fields = useFieldsWithAssociation(collection);
const form = useForm();
const selectedFields = getSelectedFields(fields, form?.values?.query || query);
return processData(selectedFields, service?.data || data || [], { t });
};

View File

@ -11,9 +11,9 @@ import { Empty, Result, Spin, Typography } from 'antd';
import React, { useContext } from 'react'; import React, { useContext } from 'react';
import { ErrorBoundary } from 'react-error-boundary'; import { ErrorBoundary } from 'react-error-boundary';
import { ChartConfigContext } from '../block'; import { ChartConfigContext } from '../block';
import { useFieldTransformer, useFieldsWithAssociation } from '../hooks'; import { useData, useFieldTransformer, useFieldsWithAssociation } from '../hooks';
import { useChartsTranslation } from '../locale'; import { useChartsTranslation } from '../locale';
import { createRendererSchema, getField, processData } from '../utils'; import { createRendererSchema, getField } from '../utils';
import { useCharts } from './ChartLibrary'; import { useCharts } from './ChartLibrary';
import { ChartRendererContext } from './ChartRendererProvider'; import { ChartRendererContext } from './ChartRendererProvider';
const { Paragraph, Text } = Typography; const { Paragraph, Text } = Typography;
@ -25,7 +25,7 @@ export const ChartRenderer: React.FC & {
const ctx = useContext(ChartRendererContext); const ctx = useContext(ChartRendererContext);
const { config, transform, collection, service, data: _data } = ctx; const { config, transform, collection, service, data: _data } = ctx;
const fields = useFieldsWithAssociation(collection); const fields = useFieldsWithAssociation(collection);
const data = processData(fields, service?.data || _data || [], { t }); const data = useData(_data, collection);
const general = config?.general || {}; const general = config?.general || {};
const advanced = config?.advanced || {}; const advanced = config?.advanced || {};
const api = useAPIClient(); const api = useAPIClient();

View File

@ -49,17 +49,12 @@ export type ChartRendererProps = {
mode?: 'builder' | 'sql'; mode?: 'builder' | 'sql';
}; };
export const ChartRendererContext = createContext<{ export const ChartRendererContext = createContext<
collection: string; {
config?: {
chartType: string;
general: any;
advanced: any;
};
transform?: TransformProps[];
service: any; service: any;
data?: any[]; data?: any[];
}>({} as any); } & ChartRendererProps
>({} as any);
export const ChartRendererProvider: React.FC<ChartRendererProps> = (props) => { export const ChartRendererProvider: React.FC<ChartRendererProps> = (props) => {
const { query, config, collection, transform } = props; const { query, config, collection, transform } = props;
@ -114,7 +109,7 @@ export const ChartRendererProvider: React.FC<ChartRendererProps> = (props) => {
} }
`} `}
> >
<ChartRendererContext.Provider value={{ collection, config, transform, service }}> <ChartRendererContext.Provider value={{ collection, config, transform, service, query }}>
{props.children} {props.children}
</ChartRendererContext.Provider> </ChartRendererContext.Provider>
</div> </div>

View File

@ -71,7 +71,7 @@ export const getSelectedFields = (fields: FieldOption[], query: QueryProps) => {
return selectedFields; return selectedFields;
}; };
export const processData = (fields: FieldOption[], data: any[], scope: any) => { export const processData = (selectedFields: FieldOption[], data: any[], scope: any) => {
const parseEnum = (field: FieldOption, value: any) => { const parseEnum = (field: FieldOption, value: any) => {
const options = field.uiSchema?.enum as { value: string; label: string }[]; const options = field.uiSchema?.enum as { value: string; label: string }[];
if (!options || !Array.isArray(options)) { if (!options || !Array.isArray(options)) {
@ -83,7 +83,7 @@ export const processData = (fields: FieldOption[], data: any[], scope: any) => {
return data.map((record) => { return data.map((record) => {
const processed = {}; const processed = {};
Object.entries(record).forEach(([key, value]) => { Object.entries(record).forEach(([key, value]) => {
const field = getField(fields, key.split('.')); const field = selectedFields.find((field) => field.value === key);
if (!field) { if (!field) {
processed[key] = value; processed[key] = value;
return; return;

View File

@ -3409,7 +3409,6 @@
"@jest/console@^29.6.2": "@jest/console@^29.6.2":
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.6.2.tgz#bf1d4101347c23e07c029a1b1ae07d550f5cc541" resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.6.2.tgz#bf1d4101347c23e07c029a1b1ae07d550f5cc541"
integrity sha512-0N0yZof5hi44HAR2pPS+ikJ3nzKNoZdVu8FffRf3wy47I7Dm7etk/3KetMdRUqzVd16V4O2m2ISpNTbnIuqy1w==
dependencies: dependencies:
"@jest/types" "^29.6.1" "@jest/types" "^29.6.1"
"@types/node" "*" "@types/node" "*"
@ -3487,7 +3486,6 @@
"@jest/core@^29.6.2": "@jest/core@^29.6.2":
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.6.2.tgz#6f2d1dbe8aa0265fcd4fb8082ae1952f148209c8" resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.6.2.tgz#6f2d1dbe8aa0265fcd4fb8082ae1952f148209c8"
integrity sha512-Oj+5B+sDMiMWLhPFF+4/DvHOf+U10rgvCLGPHP8Xlsy/7QxS51aU/eBngudHlJXnaWD5EohAgJ4js+T6pa+zOg==
dependencies: dependencies:
"@jest/console" "^29.6.2" "@jest/console" "^29.6.2"
"@jest/reporters" "^29.6.2" "@jest/reporters" "^29.6.2"
@ -3539,7 +3537,6 @@
"@jest/environment@^29.6.2": "@jest/environment@^29.6.2":
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.6.2.tgz#794c0f769d85e7553439d107d3f43186dc6874a9" resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.6.2.tgz#794c0f769d85e7553439d107d3f43186dc6874a9"
integrity sha512-AEcW43C7huGd/vogTddNNTDRpO6vQ2zaQNrttvWV18ArBx9Z56h7BIsXkNFJVOO4/kblWEQz30ckw0+L3izc+Q==
dependencies: dependencies:
"@jest/fake-timers" "^29.6.2" "@jest/fake-timers" "^29.6.2"
"@jest/types" "^29.6.1" "@jest/types" "^29.6.1"
@ -3561,7 +3558,6 @@
"@jest/expect-utils@^29.6.2": "@jest/expect-utils@^29.6.2":
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.6.2.tgz#1b97f290d0185d264dd9fdec7567a14a38a90534" resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.6.2.tgz#1b97f290d0185d264dd9fdec7567a14a38a90534"
integrity sha512-6zIhM8go3RV2IG4aIZaZbxwpOzz3ZiM23oxAlkquOIole+G6TrbeXnykxWYlqF7kz2HlBjdKtca20x9atkEQYg==
dependencies: dependencies:
jest-get-type "^29.4.3" jest-get-type "^29.4.3"
@ -3575,7 +3571,6 @@
"@jest/expect@^29.6.2": "@jest/expect@^29.6.2":
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.6.2.tgz#5a2ad58bb345165d9ce0a1845bbf873c480a4b28" resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.6.2.tgz#5a2ad58bb345165d9ce0a1845bbf873c480a4b28"
integrity sha512-m6DrEJxVKjkELTVAztTLyS/7C92Y2b0VYqmDROYKLLALHn8T/04yPs70NADUYPrV3ruI+H3J0iUIuhkjp7vkfg==
dependencies: dependencies:
expect "^29.6.2" expect "^29.6.2"
jest-snapshot "^29.6.2" jest-snapshot "^29.6.2"
@ -3602,7 +3597,6 @@
"@jest/fake-timers@^29.6.2": "@jest/fake-timers@^29.6.2":
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.6.2.tgz#fe9d43c5e4b1b901168fe6f46f861b3e652a2df4" resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.6.2.tgz#fe9d43c5e4b1b901168fe6f46f861b3e652a2df4"
integrity sha512-euZDmIlWjm1Z0lJ1D0f7a0/y5Kh/koLFMUBE5SUYWrmy8oNhJpbTBDAP6CxKnadcMLDoDf4waRYCe35cH6G6PA==
dependencies: dependencies:
"@jest/types" "^29.6.1" "@jest/types" "^29.6.1"
"@sinonjs/fake-timers" "^10.0.2" "@sinonjs/fake-timers" "^10.0.2"
@ -3623,7 +3617,6 @@
"@jest/globals@^29.6.2": "@jest/globals@^29.6.2":
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.6.2.tgz#74af81b9249122cc46f1eb25793617eec69bf21a" resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.6.2.tgz#74af81b9249122cc46f1eb25793617eec69bf21a"
integrity sha512-cjuJmNDjs6aMijCmSa1g2TNG4Lby/AeU7/02VtpW+SLcZXzOLK2GpN2nLqcFjmhy3B3AoPeQVx7BnyOf681bAw==
dependencies: dependencies:
"@jest/environment" "^29.6.2" "@jest/environment" "^29.6.2"
"@jest/expect" "^29.6.2" "@jest/expect" "^29.6.2"
@ -3688,7 +3681,6 @@
"@jest/reporters@^29.6.2": "@jest/reporters@^29.6.2":
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.6.2.tgz#524afe1d76da33d31309c2c4a2c8062d0c48780a" resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.6.2.tgz#524afe1d76da33d31309c2c4a2c8062d0c48780a"
integrity sha512-sWtijrvIav8LgfJZlrGCdN0nP2EWbakglJY49J1Y5QihcQLfy7ovyxxjJBRXMNltgt4uPtEcFmIMbVshEDfFWw==
dependencies: dependencies:
"@bcoe/v8-coverage" "^0.2.3" "@bcoe/v8-coverage" "^0.2.3"
"@jest/console" "^29.6.2" "@jest/console" "^29.6.2"
@ -3763,7 +3755,6 @@
"@jest/test-result@^29.6.2": "@jest/test-result@^29.6.2":
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.6.2.tgz#fdd11583cd1608e4db3114e8f0cce277bf7a32ed" resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.6.2.tgz#fdd11583cd1608e4db3114e8f0cce277bf7a32ed"
integrity sha512-3VKFXzcV42EYhMCsJQURptSqnyjqCGbtLuX5Xxb6Pm6gUf1wIRIl+mandIRGJyWKgNKYF9cnstti6Ls5ekduqw==
dependencies: dependencies:
"@jest/console" "^29.6.2" "@jest/console" "^29.6.2"
"@jest/types" "^29.6.1" "@jest/types" "^29.6.1"
@ -3791,7 +3782,6 @@
"@jest/test-sequencer@^29.6.2": "@jest/test-sequencer@^29.6.2":
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.6.2.tgz#585eff07a68dd75225a7eacf319780cb9f6b9bf4" resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.6.2.tgz#585eff07a68dd75225a7eacf319780cb9f6b9bf4"
integrity sha512-GVYi6PfPwVejO7slw6IDO0qKVum5jtrJ3KoLGbgBWyr2qr4GaxFV6su+ZAjdTX75Sr1DkMFRk09r2ZVa+wtCGw==
dependencies: dependencies:
"@jest/test-result" "^29.6.2" "@jest/test-result" "^29.6.2"
graceful-fs "^4.2.9" graceful-fs "^4.2.9"
@ -3862,7 +3852,6 @@
"@jest/transform@^29.6.2": "@jest/transform@^29.6.2":
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.6.2.tgz#522901ebbb211af08835bc3bcdf765ab778094e3" resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.6.2.tgz#522901ebbb211af08835bc3bcdf765ab778094e3"
integrity sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==
dependencies: dependencies:
"@babel/core" "^7.11.6" "@babel/core" "^7.11.6"
"@jest/types" "^29.6.1" "@jest/types" "^29.6.1"
@ -5802,7 +5791,6 @@
"@testing-library/dom@^9.0.0": "@testing-library/dom@^9.0.0":
version "9.3.1" version "9.3.1"
resolved "https://registry.npmmirror.com/@testing-library/dom/-/dom-9.3.1.tgz#8094f560e9389fb973fe957af41bf766937a9ee9" resolved "https://registry.npmmirror.com/@testing-library/dom/-/dom-9.3.1.tgz#8094f560e9389fb973fe957af41bf766937a9ee9"
integrity sha512-0DGPd9AR3+iDTjGoMpxIkAsUihHZ3Ai6CneU6bRRrffXMgzCdlNk43jTrD2/5LT6CBb3MWTP8v510JzYtahD2w==
dependencies: dependencies:
"@babel/code-frame" "^7.10.4" "@babel/code-frame" "^7.10.4"
"@babel/runtime" "^7.12.5" "@babel/runtime" "^7.12.5"
@ -5816,7 +5804,6 @@
"@testing-library/jest-dom@^5.17.0": "@testing-library/jest-dom@^5.17.0":
version "5.17.0" version "5.17.0"
resolved "https://registry.npmmirror.com/@testing-library/jest-dom/-/jest-dom-5.17.0.tgz#5e97c8f9a15ccf4656da00fecab505728de81e0c" resolved "https://registry.npmmirror.com/@testing-library/jest-dom/-/jest-dom-5.17.0.tgz#5e97c8f9a15ccf4656da00fecab505728de81e0c"
integrity sha512-ynmNeT7asXyH3aSVv4vvX4Rb+0qjOhdNHnO/3vuZNqPmhDpV/+rCSGwQ7bLcmU2cJ4dvoheIO85LQj0IbJHEtg==
dependencies: dependencies:
"@adobe/css-tools" "^4.0.1" "@adobe/css-tools" "^4.0.1"
"@babel/runtime" "^7.9.2" "@babel/runtime" "^7.9.2"
@ -5831,7 +5818,6 @@
"@testing-library/react@^14.0.0": "@testing-library/react@^14.0.0":
version "14.0.0" version "14.0.0"
resolved "https://registry.npmmirror.com/@testing-library/react/-/react-14.0.0.tgz#59030392a6792450b9ab8e67aea5f3cc18d6347c" resolved "https://registry.npmmirror.com/@testing-library/react/-/react-14.0.0.tgz#59030392a6792450b9ab8e67aea5f3cc18d6347c"
integrity sha512-S04gSNJbYE30TlIMLTzv6QCTzt9AqIF5y6s6SzVFILNcNvbV/jU96GeiTPillGQo+Ny64M/5PV7klNYYgv5Dfg==
dependencies: dependencies:
"@babel/runtime" "^7.12.5" "@babel/runtime" "^7.12.5"
"@testing-library/dom" "^9.0.0" "@testing-library/dom" "^9.0.0"
@ -8171,7 +8157,6 @@ babel-jest@^29.6.1:
babel-jest@^29.6.2: babel-jest@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.6.2.tgz#cada0a59e07f5acaeb11cbae7e3ba92aec9c1126" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.6.2.tgz#cada0a59e07f5acaeb11cbae7e3ba92aec9c1126"
integrity sha512-BYCzImLos6J3BH/+HvUCHG1dTf2MzmAB4jaVxHV+29RZLjR29XuYTmsf2sdDwkrb+FczkGo3kOhE7ga6sI0P4A==
dependencies: dependencies:
"@jest/transform" "^29.6.2" "@jest/transform" "^29.6.2"
"@types/babel__core" "^7.1.14" "@types/babel__core" "^7.1.14"
@ -10857,7 +10842,6 @@ dedent@^0.7.0:
dedent@^1.0.0: dedent@^1.0.0:
version "1.2.0" version "1.2.0"
resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.2.0.tgz#32039cd75c035f684e01c4a07cb88c0ecbeb57be" resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.2.0.tgz#32039cd75c035f684e01c4a07cb88c0ecbeb57be"
integrity sha512-i4tcg0ClgvMUSxwHpt+NHQ01ZJmAkl6eBvDNrSZG9e+oLRTCSHv0wpr/Bzjpf6CwKeIHGevE1M34Y1Axdms5VQ==
dedupe@^3.0.2: dedupe@^3.0.2:
version "3.0.3" version "3.0.3"
@ -12325,7 +12309,6 @@ expect@^29.6.1:
expect@^29.6.2: expect@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/expect/-/expect-29.6.2.tgz#7b08e83eba18ddc4a2cf62b5f2d1918f5cd84521" resolved "https://registry.yarnpkg.com/expect/-/expect-29.6.2.tgz#7b08e83eba18ddc4a2cf62b5f2d1918f5cd84521"
integrity sha512-iAErsLxJ8C+S02QbLAwgSGSezLQK+XXRDt8IuFXFpwCNw2ECmzZSmjKcCaFVp5VRMk+WAvz6h6jokzEzBFZEuA==
dependencies: dependencies:
"@jest/expect-utils" "^29.6.2" "@jest/expect-utils" "^29.6.2"
"@types/node" "*" "@types/node" "*"
@ -15068,7 +15051,6 @@ jest-circus@^29.6.1:
jest-circus@^29.6.2: jest-circus@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.6.2.tgz#1e6ffca60151ac66cad63fce34f443f6b5bb4258" resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.6.2.tgz#1e6ffca60151ac66cad63fce34f443f6b5bb4258"
integrity sha512-G9mN+KOYIUe2sB9kpJkO9Bk18J4dTDArNFPwoZ7WKHKel55eKIS/u2bLthxgojwlf9NLCVQfgzM/WsOVvoC6Fw==
dependencies: dependencies:
"@jest/environment" "^29.6.2" "@jest/environment" "^29.6.2"
"@jest/expect" "^29.6.2" "@jest/expect" "^29.6.2"
@ -15129,7 +15111,6 @@ jest-cli@^29.0.0, jest-cli@^29.6.1:
jest-cli@^29.6.2: jest-cli@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.6.2.tgz#edb381763398d1a292cd1b636a98bfa5644b8fda" resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.6.2.tgz#edb381763398d1a292cd1b636a98bfa5644b8fda"
integrity sha512-TT6O247v6dCEX2UGHGyflMpxhnrL0DNqP2fRTKYm3nJJpCTfXX3GCMQPGFjXDoj0i5/Blp3jriKXFgdfmbYB6Q==
dependencies: dependencies:
"@jest/core" "^29.6.2" "@jest/core" "^29.6.2"
"@jest/test-result" "^29.6.2" "@jest/test-result" "^29.6.2"
@ -15196,7 +15177,6 @@ jest-config@^29.6.1:
jest-config@^29.6.2: jest-config@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.6.2.tgz#c68723f06b31ca5e63030686e604727d406cd7c3" resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.6.2.tgz#c68723f06b31ca5e63030686e604727d406cd7c3"
integrity sha512-VxwFOC8gkiJbuodG9CPtMRjBUNZEHxwfQXmIudSTzFWxaci3Qub1ddTRbFNQlD/zUeaifLndh/eDccFX4wCMQw==
dependencies: dependencies:
"@babel/core" "^7.11.6" "@babel/core" "^7.11.6"
"@jest/test-sequencer" "^29.6.2" "@jest/test-sequencer" "^29.6.2"
@ -15251,7 +15231,6 @@ jest-diff@^29.6.1:
jest-diff@^29.6.2: jest-diff@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.6.2.tgz#c36001e5543e82a0805051d3ceac32e6825c1c46" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.6.2.tgz#c36001e5543e82a0805051d3ceac32e6825c1c46"
integrity sha512-t+ST7CB9GX5F2xKwhwCf0TAR17uNDiaPTZnVymP9lw0lssa9vG+AFyDZoeIHStU3WowFFwT+ky+er0WVl2yGhA==
dependencies: dependencies:
chalk "^4.0.0" chalk "^4.0.0"
diff-sequences "^29.4.3" diff-sequences "^29.4.3"
@ -15306,7 +15285,6 @@ jest-each@^29.6.1:
jest-each@^29.6.2: jest-each@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.6.2.tgz#c9e4b340bcbe838c73adf46b76817b15712d02ce" resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.6.2.tgz#c9e4b340bcbe838c73adf46b76817b15712d02ce"
integrity sha512-MsrsqA0Ia99cIpABBc3izS1ZYoYfhIy0NNWqPSE0YXbQjwchyt6B1HD2khzyPe1WiJA7hbxXy77ZoUQxn8UlSw==
dependencies: dependencies:
"@jest/types" "^29.6.1" "@jest/types" "^29.6.1"
chalk "^4.0.0" chalk "^4.0.0"
@ -15349,7 +15327,6 @@ jest-environment-node@^29.6.1:
jest-environment-node@^29.6.2: jest-environment-node@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.6.2.tgz#a9ea2cabff39b08eca14ccb32c8ceb924c8bb1ad" resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.6.2.tgz#a9ea2cabff39b08eca14ccb32c8ceb924c8bb1ad"
integrity sha512-YGdFeZ3T9a+/612c5mTQIllvWkddPbYcN2v95ZH24oWMbGA4GGS2XdIF92QMhUhvrjjuQWYgUGW2zawOyH63MQ==
dependencies: dependencies:
"@jest/environment" "^29.6.2" "@jest/environment" "^29.6.2"
"@jest/fake-timers" "^29.6.2" "@jest/fake-timers" "^29.6.2"
@ -15423,7 +15400,6 @@ jest-haste-map@^29.6.1:
jest-haste-map@^29.6.2: jest-haste-map@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.6.2.tgz#298c25ea5255cfad8b723179d4295cf3a50a70d1" resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.6.2.tgz#298c25ea5255cfad8b723179d4295cf3a50a70d1"
integrity sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==
dependencies: dependencies:
"@jest/types" "^29.6.1" "@jest/types" "^29.6.1"
"@types/graceful-fs" "^4.1.3" "@types/graceful-fs" "^4.1.3"
@ -15477,7 +15453,6 @@ jest-leak-detector@^29.6.1:
jest-leak-detector@^29.6.2: jest-leak-detector@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.6.2.tgz#e2b307fee78cab091c37858a98c7e1d73cdf5b38" resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.6.2.tgz#e2b307fee78cab091c37858a98c7e1d73cdf5b38"
integrity sha512-aNqYhfp5uYEO3tdWMb2bfWv6f0b4I0LOxVRpnRLAeque2uqOVVMLh6khnTcE2qJ5wAKop0HcreM1btoysD6bPQ==
dependencies: dependencies:
jest-get-type "^29.4.3" jest-get-type "^29.4.3"
pretty-format "^29.6.2" pretty-format "^29.6.2"
@ -15512,7 +15487,6 @@ jest-matcher-utils@^29.6.1:
jest-matcher-utils@^29.6.2: jest-matcher-utils@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.6.2.tgz#39de0be2baca7a64eacb27291f0bd834fea3a535" resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.6.2.tgz#39de0be2baca7a64eacb27291f0bd834fea3a535"
integrity sha512-4LiAk3hSSobtomeIAzFTe+N8kL6z0JtF3n6I4fg29iIW7tt99R7ZcIFW34QkX+DuVrf+CUe6wuVOpm7ZKFJzZQ==
dependencies: dependencies:
chalk "^4.0.0" chalk "^4.0.0"
jest-diff "^29.6.2" jest-diff "^29.6.2"
@ -15563,7 +15537,6 @@ jest-message-util@^29.6.1:
jest-message-util@^29.6.2: jest-message-util@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.6.2.tgz#af7adc2209c552f3f5ae31e77cf0a261f23dc2bb" resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.6.2.tgz#af7adc2209c552f3f5ae31e77cf0a261f23dc2bb"
integrity sha512-vnIGYEjoPSuRqV8W9t+Wow95SDp6KPX2Uf7EoeG9G99J2OVh7OSwpS4B6J0NfpEIpfkBNHlBZpA2rblEuEFhZQ==
dependencies: dependencies:
"@babel/code-frame" "^7.12.13" "@babel/code-frame" "^7.12.13"
"@jest/types" "^29.6.1" "@jest/types" "^29.6.1"
@ -15592,7 +15565,6 @@ jest-mock@^29.6.1:
jest-mock@^29.6.2: jest-mock@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.6.2.tgz#ef9c9b4d38c34a2ad61010a021866dad41ce5e00" resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.6.2.tgz#ef9c9b4d38c34a2ad61010a021866dad41ce5e00"
integrity sha512-hoSv3lb3byzdKfwqCuT6uTscan471GUECqgNYykg6ob0yiAw3zYc7OrPnI9Qv8Wwoa4lC7AZ9hyS4AiIx5U2zg==
dependencies: dependencies:
"@jest/types" "^29.6.1" "@jest/types" "^29.6.1"
"@types/node" "*" "@types/node" "*"
@ -15628,7 +15600,6 @@ jest-resolve-dependencies@^29.6.1:
jest-resolve-dependencies@^29.6.2: jest-resolve-dependencies@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.2.tgz#36435269b6672c256bcc85fb384872c134cc4cf2" resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.2.tgz#36435269b6672c256bcc85fb384872c134cc4cf2"
integrity sha512-LGqjDWxg2fuQQm7ypDxduLu/m4+4Lb4gczc13v51VMZbVP5tSBILqVx8qfWcsdP8f0G7aIqByIALDB0R93yL+w==
dependencies: dependencies:
jest-regex-util "^29.4.3" jest-regex-util "^29.4.3"
jest-snapshot "^29.6.2" jest-snapshot "^29.6.2"
@ -15660,7 +15631,6 @@ jest-resolve@^29.6.1:
jest-resolve@^29.6.2: jest-resolve@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.6.2.tgz#f18405fe4b50159b7b6d85e81f6a524d22afb838" resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.6.2.tgz#f18405fe4b50159b7b6d85e81f6a524d22afb838"
integrity sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==
dependencies: dependencies:
chalk "^4.0.0" chalk "^4.0.0"
graceful-fs "^4.2.9" graceful-fs "^4.2.9"
@ -15725,7 +15695,6 @@ jest-runner@^29.6.1:
jest-runner@^29.6.2: jest-runner@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.6.2.tgz#89e8e32a8fef24781a7c4c49cd1cb6358ac7fc01" resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.6.2.tgz#89e8e32a8fef24781a7c4c49cd1cb6358ac7fc01"
integrity sha512-wXOT/a0EspYgfMiYHxwGLPCZfC0c38MivAlb2lMEAlwHINKemrttu1uSbcGbfDV31sFaPWnWJPmb2qXM8pqZ4w==
dependencies: dependencies:
"@jest/console" "^29.6.2" "@jest/console" "^29.6.2"
"@jest/environment" "^29.6.2" "@jest/environment" "^29.6.2"
@ -15807,7 +15776,6 @@ jest-runtime@^29.6.1:
jest-runtime@^29.6.2: jest-runtime@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.6.2.tgz#692f25e387f982e89ab83270e684a9786248e545" resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.6.2.tgz#692f25e387f982e89ab83270e684a9786248e545"
integrity sha512-2X9dqK768KufGJyIeLmIzToDmsN0m7Iek8QNxRSI/2+iPFYHF0jTwlO3ftn7gdKd98G/VQw9XJCk77rbTGZnJg==
dependencies: dependencies:
"@jest/environment" "^29.6.2" "@jest/environment" "^29.6.2"
"@jest/fake-timers" "^29.6.2" "@jest/fake-timers" "^29.6.2"
@ -15883,7 +15851,6 @@ jest-snapshot@^29.6.1:
jest-snapshot@^29.6.2: jest-snapshot@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.6.2.tgz#9b431b561a83f2bdfe041e1cab8a6becdb01af9c" resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.6.2.tgz#9b431b561a83f2bdfe041e1cab8a6becdb01af9c"
integrity sha512-1OdjqvqmRdGNvWXr/YZHuyhh5DeaLp1p/F8Tht/MrMw4Kr1Uu/j4lRG+iKl1DAqUJDWxtQBMk41Lnf/JETYBRA==
dependencies: dependencies:
"@babel/core" "^7.11.6" "@babel/core" "^7.11.6"
"@babel/generator" "^7.7.2" "@babel/generator" "^7.7.2"
@ -15948,7 +15915,6 @@ jest-util@^29.4.3, jest-util@^29.5.0:
jest-util@^29.6.2: jest-util@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.6.2.tgz#8a052df8fff2eebe446769fd88814521a517664d" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.6.2.tgz#8a052df8fff2eebe446769fd88814521a517664d"
integrity sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==
dependencies: dependencies:
"@jest/types" "^29.6.1" "@jest/types" "^29.6.1"
"@types/node" "*" "@types/node" "*"
@ -15982,7 +15948,6 @@ jest-validate@^29.6.1:
jest-validate@^29.6.2: jest-validate@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.6.2.tgz#25d972af35b2415b83b1373baf1a47bb266c1082" resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.6.2.tgz#25d972af35b2415b83b1373baf1a47bb266c1082"
integrity sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==
dependencies: dependencies:
"@jest/types" "^29.6.1" "@jest/types" "^29.6.1"
camelcase "^6.2.0" camelcase "^6.2.0"
@ -16019,7 +15984,6 @@ jest-watcher@^29.6.1:
jest-watcher@^29.6.2: jest-watcher@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.6.2.tgz#77c224674f0620d9f6643c4cfca186d8893ca088" resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.6.2.tgz#77c224674f0620d9f6643c4cfca186d8893ca088"
integrity sha512-GZitlqkMkhkefjfN/p3SJjrDaxPflqxEAv3/ik10OirZqJGYH5rPiIsgVcfof0Tdqg3shQGdEIxDBx+B4tuLzA==
dependencies: dependencies:
"@jest/test-result" "^29.6.2" "@jest/test-result" "^29.6.2"
"@jest/types" "^29.6.1" "@jest/types" "^29.6.1"
@ -16075,7 +16039,6 @@ jest-worker@^29.6.1:
jest-worker@^29.6.2: jest-worker@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.6.2.tgz#682fbc4b6856ad0aa122a5403c6d048b83f3fb44" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.6.2.tgz#682fbc4b6856ad0aa122a5403c6d048b83f3fb44"
integrity sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==
dependencies: dependencies:
"@types/node" "*" "@types/node" "*"
jest-util "^29.6.2" jest-util "^29.6.2"
@ -16101,7 +16064,6 @@ jest@^29.0.0:
jest@^29.6.2: jest@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/jest/-/jest-29.6.2.tgz#3bd55b9fd46a161b2edbdf5f1d1bd0d1eab76c42" resolved "https://registry.yarnpkg.com/jest/-/jest-29.6.2.tgz#3bd55b9fd46a161b2edbdf5f1d1bd0d1eab76c42"
integrity sha512-8eQg2mqFbaP7CwfsTpCxQ+sHzw1WuNWL5UUvjnWP4hx2riGz9fPSzYOaU5q8/GqWn1TfgZIVTqYJygbGbWAANg==
dependencies: dependencies:
"@jest/core" "^29.6.2" "@jest/core" "^29.6.2"
"@jest/types" "^29.6.1" "@jest/types" "^29.6.1"
@ -20676,7 +20638,6 @@ pretty-format@^29.6.1:
pretty-format@^29.6.2: pretty-format@^29.6.2:
version "29.6.2" version "29.6.2"
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.6.2.tgz#3d5829261a8a4d89d8b9769064b29c50ed486a47" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.6.2.tgz#3d5829261a8a4d89d8b9769064b29c50ed486a47"
integrity sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==
dependencies: dependencies:
"@jest/schemas" "^29.6.0" "@jest/schemas" "^29.6.0"
ansi-styles "^5.0.0" ansi-styles "^5.0.0"
@ -24308,7 +24269,6 @@ ts-dedent@^2.2.0:
ts-jest@^29.0.0, ts-jest@^29.1.1: ts-jest@^29.0.0, ts-jest@^29.1.1:
version "29.1.1" version "29.1.1"
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.1.tgz#f58fe62c63caf7bfcc5cc6472082f79180f0815b" resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.1.tgz#f58fe62c63caf7bfcc5cc6472082f79180f0815b"
integrity sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA==
dependencies: dependencies:
bs-logger "0.x" bs-logger "0.x"
fast-json-stable-stringify "2.x" fast-json-stable-stringify "2.x"