From e914567cf1dae0a79dad3022425f15e2fe9e9a99 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 30 May 2022 16:52:51 +0200 Subject: [PATCH] (bug) fix multi select behavior --- CHANGELOG.md | 1 + .../authentication-provider/oauth2-form.tsx | 2 +- .../openid-connect-form.tsx | 16 +- .../components/form/form-multi-select.tsx | 161 +++++++++--------- .../components/socials/edit-socials.tsx | 2 +- .../components/user/user-profile-form.tsx | 36 ++-- app/frontend/src/javascript/models/user.ts | 17 +- db/schema.rb | 20 +-- package.json | 2 +- yarn.lock | 139 ++++++++++++--- 10 files changed, 243 insertions(+), 153 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3ddd9c9f..823de2432 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## next deploy +- Updated react-select to 5.3.2 - Fix a bug: unable to run scripts on systemts with legacy version of docker-compose - Fix a bug: unable to sign up if admin actived organization's additional fields with required - Fix a bug: undefined error in new member page diff --git a/app/frontend/src/javascript/components/authentication-provider/oauth2-form.tsx b/app/frontend/src/javascript/components/authentication-provider/oauth2-form.tsx index 88ae8ce15..1d6f0f5df 100644 --- a/app/frontend/src/javascript/components/authentication-provider/oauth2-form.tsx +++ b/app/frontend/src/javascript/components/authentication-provider/oauth2-form.tsx @@ -18,7 +18,7 @@ export const Oauth2Form = ({ register, strateg // regular expression to validate the input fields const endpointRegex = /^\/?([-._~:?#[\]@!$&'()*+,;=%\w]+\/?)*$/; - const urlRegex = /^(https?:\/\/)([\da-z.-]+)\.([-a-z0-9.]{2,30})([/\w .-]*)*\/?$/; + const urlRegex = /^(https?:\/\/)([^.]+)\.(.{2,30})(\/.*)*\/?$/; /** * Build the callback URL, based on the strategy name. diff --git a/app/frontend/src/javascript/components/authentication-provider/openid-connect-form.tsx b/app/frontend/src/javascript/components/authentication-provider/openid-connect-form.tsx index 96e10b4b6..aad8aa199 100644 --- a/app/frontend/src/javascript/components/authentication-provider/openid-connect-form.tsx +++ b/app/frontend/src/javascript/components/authentication-provider/openid-connect-form.tsx @@ -41,7 +41,7 @@ export const OpenidConnectForm = ): string => { - return values.join(' '); - }; - return (
@@ -119,11 +111,9 @@ export const OpenidConnectForm = } options={scopesAvailable.map((scope) => ({ value: scope, label: scope }))} - formatResult={formatScopes} + delimiter={' '} creatable - setValue={setValue} - currentValue={currentFormValues.scope?.split(' ')} - register={register} />} + control={control} />} } diff --git a/app/frontend/src/javascript/components/form/form-multi-select.tsx b/app/frontend/src/javascript/components/form/form-multi-select.tsx index ab2be0fd4..2cac0970b 100644 --- a/app/frontend/src/javascript/components/form/form-multi-select.tsx +++ b/app/frontend/src/javascript/components/form/form-multi-select.tsx @@ -1,47 +1,46 @@ import React, { useEffect } from 'react'; +import AsyncSelect from 'react-select/async'; import Select from 'react-select'; -import { difference } from 'lodash'; +import AsyncCreatableSelect from 'react-select/async-creatable'; +import CreatableSelect from 'react-select/creatable'; import { FieldValues } from 'react-hook-form/dist/types/fields'; import { FieldPath } from 'react-hook-form/dist/types/path'; -import { FormComponent } from '../../models/form-component'; +import { FormControlledComponent } from '../../models/form-component'; import { AbstractFormItem, AbstractFormItemProps } from './abstract-form-item'; -import CreatableSelect from 'react-select/creatable'; import { useTranslation } from 'react-i18next'; -import { FieldPathValue, Path } from 'react-hook-form'; -import { UnpackNestedValue, UseFormSetValue } from 'react-hook-form/dist/types/form'; +import { Controller, FieldPathValue, Path } from 'react-hook-form'; +import { UnpackNestedValue } from 'react-hook-form/dist/types/form'; -interface CommonProps extends FormComponent, AbstractFormItemProps { - options: Array>, +interface CommonProps extends FormControlledComponent, AbstractFormItemProps { valuesDefault?: Array, onChange?: (values: Array) => void, placeholder?: string, - formatResult?: (values: Array) => string, + creatable?: boolean, + delimiter?: string } -// if creatable is set to true, the setValue must be provided -type CreatableProps = - { creatable: true, setValue: UseFormSetValue, currentValue?: Array } | - { creatable?: false, setValue?: never, currentValue?: never }; +// we should provide either an array of options or a function that returns a promise, but not both +type OptionsProps = + { options: Array>, loadOptions?: never } | + { options?: never, loadOptions: (inputValue: string, callback: (options: Array>) => void) => void }; -type FormSelectProps = CommonProps & CreatableProps; +type FormSelectProps = CommonProps & OptionsProps; /** * Option format, expected by react-select * @see https://github.com/JedWatson/react-select */ -type selectOption = { value: TOptionValue, label: string }; +type selectOption = { value: TOptionValue, label: string, select?: boolean }; /** * This component is a wrapper around react-select to use with react-hook-form. * It is a multi-select component. */ -export const FormMultiSelect = ({ id, label, tooltip, className, register, placeholder, options, valuesDefault, error, rules, disabled, onChange, formState, warning, formatResult, creatable, setValue, currentValue }: FormSelectProps) => { +export const FormMultiSelect = ({ id, label, tooltip, className, control, placeholder, options, valuesDefault, error, rules, disabled, onChange, formState, warning, loadOptions, creatable, delimiter }: FormSelectProps) => { const { t } = useTranslation('shared'); const [isDisabled, setIsDisabled] = React.useState(false); - const [allOptions, setAllOptions] = React.useState>>(options); - const [createdOptions, setCreatedOptions] = React.useState>>([]); - const [selectedOptions, setSelectedOptions] = React.useState>(valuesDefault); + const [allOptions, setAllOptions] = React.useState>>(options || []); useEffect(() => { if (typeof disabled === 'function') { @@ -52,70 +51,43 @@ export const FormMultiSelect = ( }, [disabled]); useEffect(() => { - setAllOptions(options.concat(createdOptions)); - }, [options, createdOptions]); - - useEffect(() => { - if (typeof onChange === 'function') { - onChange(selectedOptions); + if (typeof loadOptions === 'function') { + loadOptions('', options => { + setAllOptions(options); + }); } - setValue( - id as Path, - getResult() as UnpackNestedValue>> - ); - }, [selectedOptions]); - - useEffect(() => { - if (selectedOptions === undefined && currentValue && currentValue[0]) { - setSelectedOptions(currentValue); - const custom = difference(currentValue, allOptions.map(o => o.value)); - if (custom.length > 0) { - setCreatedOptions(custom.map(c => { - return { value: c, label: c as unknown as string }; - })); - } - } - }, [currentValue]); + }, [loadOptions]); /** * The following callback will set the new selected options in the component state. */ - const onChangeCb = (newValues: Array): void => { - setSelectedOptions(newValues); + const onChangeCb = (newValues: Array, rhfOnChange: (values: Array) => void): void => { + if (typeof onChange === 'function') { + onChange(newValues); + } + if (typeof rhfOnChange === 'function') { + rhfOnChange(newValues); + } }; /** * This function will return the currently selected options, according to the selectedOptions state. */ - const getCurrentValues = (): Array> => { - return allOptions.filter(c => selectedOptions?.includes(c.value)); - }; - - /** - * Return the expected result (a string or an array). - * This is used in the hidden input. - */ - const getResult = (): string => { - if (!selectedOptions) return undefined; - - if (typeof formatResult === 'function') { - return formatResult(selectedOptions); - } else { - return selectedOptions.join(','); - } + const getCurrentValues = (value: Array): Array> => { + return allOptions.filter(c => value?.includes(c.value)); }; /** * When the select is 'creatable', this callback handle the creation and the selection of a new option. */ - const handleCreate = (inputValue: string) => { + const handleCreate = (inputValue: string, currentSelection: Array, rhfOnChange: (values: Array) => void) => { // add the new value to the list of options const newValue = inputValue as unknown as TOptionValue; const newOption = { value: newValue, label: inputValue }; - setCreatedOptions([...createdOptions, newOption]); - - // select the new option - setSelectedOptions([...selectedOptions, newValue]); + setAllOptions([...allOptions, newOption]); + if (typeof rhfOnChange === 'function') { + rhfOnChange([...currentSelection, newValue]); + } }; /** @@ -125,33 +97,52 @@ export const FormMultiSelect = ( return t('app.shared.form_multi_select.create_label', { VALUE: inputValue }); }; - // if the user can create new options, we need to use a different component - const AbstractSelect = creatable ? CreatableSelect : Select; + // if the user can create new options, and/or load the options through a promise need to use different components + const AbstractSelect = loadOptions + ? creatable + ? AsyncCreatableSelect + : AsyncSelect + : creatable + ? CreatableSelect + : Select; return ( - { - const values = val?.map(c => c.value); - onChangeCb(values); - }} - onCreateOption={handleCreate} - formatCreateLabel={formatCreateLabel} - placeholder={placeholder} - options={allOptions} - isDisabled={isDisabled} - isMulti /> - , { - ...rules, - value: getResult() as FieldPathValue> - })} /> + } + control={control} + defaultValue={valuesDefault as UnpackNestedValue>>} + rules={rules} + render={({ field: { onChange: rhfOnChange, value, ref } }) => { + const selectProps = { + classNamePrefix: 'rs', + className: 'rs', + ref, + value: getCurrentValues(value), + delimiter, + placeholder, + isDisabled, + isMulti: true, + onChange: val => onChangeCb(val?.map(c => c.value), rhfOnChange), + options: allOptions + }; + + if (loadOptions) { + Object.assign(selectProps, { loadOptions, defaultOptions: true, cacheOptions: true }); + } + + if (creatable) { + Object.assign(selectProps, { + formatCreateLabel, + onCreateOption: inputValue => handleCreate(inputValue, value, rhfOnChange) + }); + } + + return (); + }} + /> ); }; diff --git a/app/frontend/src/javascript/components/socials/edit-socials.tsx b/app/frontend/src/javascript/components/socials/edit-socials.tsx index 7e4e98e22..39132636c 100644 --- a/app/frontend/src/javascript/components/socials/edit-socials.tsx +++ b/app/frontend/src/javascript/components/socials/edit-socials.tsx @@ -19,7 +19,7 @@ interface EditSocialsProps { export const EditSocials = ({ register, setValue, networks, formState, disabled }: EditSocialsProps) => { const { t } = useTranslation('shared'); // regular expression to validate the the input fields - const urlRegex = /^(https?:\/\/)([\da-z.-]+)\.([-a-z\d.]{2,30})([/\w .-]*)*\/?$/; + const urlRegex = /^(https?:\/\/)([^.]+)\.(.{2,30})(\/.*)*\/?$/; const initSelectedNetworks = networks.filter(el => !['', null, undefined].includes(el.url)); const [selectedNetworks, setSelectedNetworks] = useState(initSelectedNetworks); diff --git a/app/frontend/src/javascript/components/user/user-profile-form.tsx b/app/frontend/src/javascript/components/user/user-profile-form.tsx index 38d0178be..1114f6876 100644 --- a/app/frontend/src/javascript/components/user/user-profile-form.tsx +++ b/app/frontend/src/javascript/components/user/user-profile-form.tsx @@ -58,7 +58,7 @@ export const UserProfileForm: React.FC = ({ action, size, // regular expression to validate the input fields const phoneRegex = /^((00|\+)\d{2,3})?\d{4,14}$/; - const urlRegex = /^(https?:\/\/)([\da-z.-]+)\.([-a-z\d.]{2,30})([/\w .-]*)*\/?$/; + const urlRegex = /^(https?:\/\/)([^.]+)\.(.{2,30})(\/.*)*\/?$/; const { handleSubmit, register, control, formState, setValue, reset } = useForm({ defaultValues: { ...user } }); const output = useWatch({ control }); @@ -67,8 +67,6 @@ export const UserProfileForm: React.FC = ({ action, size, const [isLocalDatabaseProvider, setIsLocalDatabaseProvider] = useState(false); const [groups, setGroups] = useState([]); const [termsAndConditions, setTermsAndConditions] = useState(null); - const [trainings, setTrainings] = useState([]); - const [tags, setTags] = useState([]); const [profileCustomFields, setProfileCustomFields] = useState([]); useEffect(() => { @@ -83,16 +81,6 @@ export const UserProfileForm: React.FC = ({ action, size, if (showTermsAndConditionsInput) { CustomAssetAPI.get(CustomAssetName.CguFile).then(setTermsAndConditions).catch(error => onError(error)); } - if (showTrainingsInput) { - TrainingAPI.index({ disabled: false }).then(data => { - setTrainings(buildOptions(data)); - }).catch(error => onError(error)); - } - if (showTagsInput) { - TagAPI.index().then(data => { - setTags(buildOptions(data)); - }).catch(error => onError(error)); - } ProfileCustomFieldAPI.index().then(data => { const fData = data.filter(f => f.actived); setProfileCustomFields(fData); @@ -117,6 +105,24 @@ export const UserProfileForm: React.FC = ({ action, size, }); }; + /** + * Asynchronously load the full list of enabled trainings to display in the drop-down select field + */ + const loadTrainings = (inputValue: string, callback: (options: Array) => void): void => { + TrainingAPI.index({ disabled: false }).then(data => { + callback(buildOptions(data)); + }).catch(error => onError(error)); + }; + + /** + * Asynchronously load the full list of tags to display in the drop-down select field + */ + const loadTags = (inputValue: string, callback: (options: Array) => void): void => { + TagAPI.index().then(data => { + callback(buildOptions(data)); + }).catch(error => onError(error)); + }; + /** * Callback triggered when the form is submitted: process with the user creation or update. */ @@ -344,14 +350,14 @@ export const UserProfileForm: React.FC = ({ action, size,
} {showTrainingsInput &&
} {showTagsInput &&
diff --git a/app/frontend/src/javascript/models/user.ts b/app/frontend/src/javascript/models/user.ts index 3f59fbf7c..d2b3a1c0b 100644 --- a/app/frontend/src/javascript/models/user.ts +++ b/app/frontend/src/javascript/models/user.ts @@ -53,12 +53,14 @@ export interface User { address: string } }, - user_profile_custom_fields_attributes: { - id: number, - value: string, - invoicing_profile_id: number, - profile_custom_field_id: number - } + user_profile_custom_fields_attributes: Array< + { + id?: number, + value: string, + invoicing_profile_id: number, + profile_custom_field_id: number + } + > }, statistic_profile_attributes: { id: number, @@ -84,7 +86,8 @@ export interface User { training_credits: Array, machine_credits: Array<{ machine_id: number, hours_used: number }>, last_sign_in_at: TDateISO - validated_at: TDateISO + validated_at: TDateISO, + tag_ids: Array } type OrderingKey = 'last_name' | 'first_name' | 'email' | 'phone' | 'group' | 'plan' | 'id' diff --git a/db/schema.rb b/db/schema.rb index b49a86421..6c6b96071 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -19,8 +19,8 @@ ActiveRecord::Schema.define(version: 2022_05_17_140916) do enable_extension "unaccent" create_table "abuses", id: :serial, force: :cascade do |t| - t.string "signaled_type" t.integer "signaled_id" + t.string "signaled_type" t.string "first_name" t.string "last_name" t.string "email" @@ -49,8 +49,8 @@ ActiveRecord::Schema.define(version: 2022_05_17_140916) do t.string "locality" t.string "country" t.string "postal_code" - t.string "placeable_type" t.integer "placeable_id" + t.string "placeable_type" t.datetime "created_at" t.datetime "updated_at" end @@ -64,8 +64,8 @@ ActiveRecord::Schema.define(version: 2022_05_17_140916) do end create_table "assets", id: :serial, force: :cascade do |t| - t.string "viewable_type" t.integer "viewable_id" + t.string "viewable_type" t.string "attachment" t.string "type" t.datetime "created_at" @@ -146,8 +146,8 @@ ActiveRecord::Schema.define(version: 2022_05_17_140916) do end create_table "credits", id: :serial, force: :cascade do |t| - t.string "creditable_type" t.integer "creditable_id" + t.string "creditable_type" t.integer "plan_id" t.integer "hours" t.datetime "created_at" @@ -369,15 +369,15 @@ ActiveRecord::Schema.define(version: 2022_05_17_140916) do create_table "notifications", id: :serial, force: :cascade do |t| t.integer "receiver_id" - t.string "attached_object_type" t.integer "attached_object_id" + t.string "attached_object_type" t.integer "notification_type_id" t.boolean "is_read", default: false t.datetime "created_at" t.datetime "updated_at" t.string "receiver_type" t.boolean "is_send", default: false - t.jsonb "meta_data", default: "{}" + t.jsonb "meta_data", default: {} t.index ["notification_type_id"], name: "index_notifications_on_notification_type_id" t.index ["receiver_id"], name: "index_notifications_on_receiver_id" end @@ -570,8 +570,8 @@ ActiveRecord::Schema.define(version: 2022_05_17_140916) do create_table "prices", id: :serial, force: :cascade do |t| t.integer "group_id" t.integer "plan_id" - t.string "priceable_type" t.integer "priceable_id" + t.string "priceable_type" t.integer "amount" t.datetime "created_at", null: false t.datetime "updated_at", null: false @@ -729,8 +729,8 @@ ActiveRecord::Schema.define(version: 2022_05_17_140916) do t.text "message" t.datetime "created_at" t.datetime "updated_at" - t.string "reservable_type" t.integer "reservable_id" + t.string "reservable_type" t.integer "nb_reserve_places" t.integer "statistic_profile_id" t.index ["reservable_type", "reservable_id"], name: "index_reservations_on_reservable_type_and_reservable_id" @@ -739,8 +739,8 @@ ActiveRecord::Schema.define(version: 2022_05_17_140916) do create_table "roles", id: :serial, force: :cascade do |t| t.string "name" - t.string "resource_type" t.integer "resource_id" + t.string "resource_type" t.datetime "created_at" t.datetime "updated_at" t.index ["name", "resource_type", "resource_id"], name: "index_roles_on_name_and_resource_type_and_resource_id" @@ -1021,8 +1021,8 @@ ActiveRecord::Schema.define(version: 2022_05_17_140916) do t.boolean "is_allow_newsletter" t.inet "current_sign_in_ip" t.inet "last_sign_in_ip" - t.datetime "validated_at" t.string "mapped_from_sso" + t.datetime "validated_at" t.index ["auth_token"], name: "index_users_on_auth_token" t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true t.index ["email"], name: "index_users_on_email", unique: true diff --git a/package.json b/package.json index 4ed7b041d..0497e8d4b 100644 --- a/package.json +++ b/package.json @@ -137,7 +137,7 @@ "react-hook-form": "^7.30.0", "react-i18next": "^11.15.6", "react-modal": "^3.11.2", - "react-select": "^5.2.2", + "react-select": "^5.3.2", "react-switch": "^6.0.0", "react2angular": "^4.0.6", "resolve-url-loader": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index d7bc10bfc..463c8cbdd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -370,6 +370,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5" integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA== +"@babel/helper-plugin-utils@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz#86c2347da5acbf5583ba0a10aed4c9bf9da9cf96" + integrity sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA== + "@babel/helper-remap-async-to-generator@^7.16.8": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3" @@ -719,6 +724,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" +"@babel/plugin-syntax-jsx@^7.12.13": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.17.12.tgz#834035b45061983a491f60096f61a2e7c5674a47" + integrity sha512-spyY3E3AURfxh/RHtjx5j6hs8am5NbUBGfcZ2vB3uShSpZdQyXSf5rR5Mk76vbtlAZOelyVQ71Fg0x9SG4fsog== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-syntax-jsx@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz#50b6571d13f764266a113d77c82b4a6508bbe665" @@ -1370,6 +1382,13 @@ dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.7.2": + version "7.18.3" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.3.tgz#c7b654b57f6f63cf7f8b418ac9ca04408c4579f4" + integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/template@^7.14.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4" @@ -1469,6 +1488,24 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz#d5e0706cf8c6acd8c6032f8d54070af261bbbb2f" integrity sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA== +"@emotion/babel-plugin@^11.7.1": + version "11.9.2" + resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.9.2.tgz#723b6d394c89fb2ef782229d92ba95a740576e95" + integrity sha512-Pr/7HGH6H6yKgnVFNEj2MVlreu3ADqftqjqwUvDy/OJzKFgxKeTQ+eeUf20FOTuHVkDON2iNa25rAXVYtWJCjw== + dependencies: + "@babel/helper-module-imports" "^7.12.13" + "@babel/plugin-syntax-jsx" "^7.12.13" + "@babel/runtime" "^7.13.10" + "@emotion/hash" "^0.8.0" + "@emotion/memoize" "^0.7.5" + "@emotion/serialize" "^1.0.2" + babel-plugin-macros "^2.6.1" + convert-source-map "^1.5.0" + escape-string-regexp "^4.0.0" + find-root "^1.1.0" + source-map "^0.5.7" + stylis "4.0.13" + "@emotion/cache@^11.4.0": version "11.4.0" resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.4.0.tgz#293fc9d9a7a38b9aad8e9337e5014366c3b09ac0" @@ -1480,26 +1517,37 @@ "@emotion/weak-memoize" "^0.2.5" stylis "^4.0.3" +"@emotion/cache@^11.7.1": + version "11.7.1" + resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz#08d080e396a42e0037848214e8aa7bf879065539" + integrity sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A== + dependencies: + "@emotion/memoize" "^0.7.4" + "@emotion/sheet" "^1.1.0" + "@emotion/utils" "^1.0.0" + "@emotion/weak-memoize" "^0.2.5" + stylis "4.0.13" + "@emotion/hash@^0.8.0": version "0.8.0" resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413" integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow== -"@emotion/memoize@^0.7.4": +"@emotion/memoize@^0.7.4", "@emotion/memoize@^0.7.5": version "0.7.5" resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50" integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ== -"@emotion/react@^11.1.1": - version "11.4.0" - resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.4.0.tgz#2465ad7b073a691409b88dfd96dc17097ddad9b7" - integrity sha512-4XklWsl9BdtatLoJpSjusXhpKv9YVteYKh9hPKP1Sxl+mswEFoUe0WtmtWjxEjkA51DQ2QRMCNOvKcSlCQ7ivg== +"@emotion/react@^11.8.1": + version "11.9.0" + resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.9.0.tgz#b6d42b1db3bd7511e7a7c4151dc8bc82e14593b8" + integrity sha512-lBVSF5d0ceKtfKCDQJveNAtkC7ayxpVlgOohLgXqRwqWr9bOf4TZAFFyIcNngnV6xK6X4x2ZeXq7vliHkoVkxQ== dependencies: "@babel/runtime" "^7.13.10" - "@emotion/cache" "^11.4.0" - "@emotion/serialize" "^1.0.2" - "@emotion/sheet" "^1.0.1" - "@emotion/utils" "^1.0.0" + "@emotion/babel-plugin" "^11.7.1" + "@emotion/cache" "^11.7.1" + "@emotion/serialize" "^1.0.3" + "@emotion/utils" "^1.1.0" "@emotion/weak-memoize" "^0.2.5" hoist-non-react-statics "^3.3.1" @@ -1514,11 +1562,27 @@ "@emotion/utils" "^1.0.0" csstype "^3.0.2" -"@emotion/sheet@^1.0.0", "@emotion/sheet@^1.0.1": +"@emotion/serialize@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.0.3.tgz#99e2060c26c6292469fb30db41f4690e1c8fea63" + integrity sha512-2mSSvgLfyV3q+iVh3YWgNlUc2a9ZlDU7DjuP5MjK3AXRR0dYigCrP99aeFtaB2L/hjfEZdSThn5dsZ0ufqbvsA== + dependencies: + "@emotion/hash" "^0.8.0" + "@emotion/memoize" "^0.7.4" + "@emotion/unitless" "^0.7.5" + "@emotion/utils" "^1.0.0" + csstype "^3.0.2" + +"@emotion/sheet@^1.0.0": version "1.0.1" resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.1.tgz#245f54abb02dfd82326e28689f34c27aa9b2a698" integrity sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g== +"@emotion/sheet@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz#56d99c41f0a1cda2726a05aa6a20afd4c63e58d2" + integrity sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g== + "@emotion/unitless@^0.7.5": version "0.7.5" resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" @@ -1529,6 +1593,11 @@ resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.0.0.tgz#abe06a83160b10570816c913990245813a2fd6af" integrity sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA== +"@emotion/utils@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.1.0.tgz#86b0b297f3f1a0f2bdb08eeac9a2f49afd40d0cf" + integrity sha512-iRLa/Y4Rs5H/f2nimczYmS5kFJEbpiVvgN3XVfZ022IYhuNA1IRSHEizcof88LtCTXtl9S2Cxt32KgaXEu72JQ== + "@emotion/weak-memoize@^0.2.5": version "0.2.5" resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46" @@ -2965,6 +3034,15 @@ babel-plugin-dynamic-import-node@^2.3.3: dependencies: object.assign "^4.1.0" +babel-plugin-macros@^2.6.1: + version "2.8.0" + resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138" + integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg== + dependencies: + "@babel/runtime" "^7.7.2" + cosmiconfig "^6.0.0" + resolve "^1.12.0" + babel-plugin-macros@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz#9ef6dc74deb934b4db344dc973ee851d148c50c1" @@ -3379,7 +3457,7 @@ content-type@~1.0.4: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== -convert-source-map@^1.7.0: +convert-source-map@^1.5.0, convert-source-map@^1.7.0: version "1.8.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== @@ -3427,6 +3505,17 @@ core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= +cosmiconfig@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" + integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg== + dependencies: + "@types/parse-json" "^4.0.0" + import-fresh "^3.1.0" + parse-json "^5.0.0" + path-type "^4.0.0" + yaml "^1.7.2" + cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" @@ -4348,6 +4437,11 @@ find-cache-dir@^3.3.1: make-dir "^3.0.2" pkg-dir "^4.1.0" +find-root@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" + integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng== + find-up@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" @@ -4794,7 +4888,7 @@ immutable@^4.0.0: resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23" integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw== -import-fresh@^3.0.0, import-fresh@^3.2.1: +import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== @@ -6486,14 +6580,14 @@ react-refresh@^0.11.0: resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.11.0.tgz#77198b944733f0f1f1a90e791de4541f9f074046" integrity sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A== -react-select@^5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.2.2.tgz#3d5edf0a60f1276fd5f29f9f90a305f0a25a5189" - integrity sha512-miGS2rT1XbFNjduMZT+V73xbJEeMzVkJOz727F6MeAr2hKE0uUSA8Ff7vD44H32x2PD3SRB6OXTY/L+fTV3z9w== +react-select@^5.3.2: + version "5.3.2" + resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.3.2.tgz#ecee0d5c59ed4acb7f567f7de3c75a488d93dacb" + integrity sha512-W6Irh7U6Ha7p5uQQ2ZnemoCQ8mcfgOtHfw3wuMzG6FAu0P+CYicgofSLOq97BhjMx8jS+h+wwWdCBeVVZ9VqlQ== dependencies: "@babel/runtime" "^7.12.0" "@emotion/cache" "^11.4.0" - "@emotion/react" "^11.1.1" + "@emotion/react" "^11.8.1" "@types/react-transition-group" "^4.4.0" memoize-one "^5.0.0" prop-types "^15.6.0" @@ -6738,7 +6832,7 @@ resolve@^1.10.1, resolve@^1.14.2: is-core-module "^2.2.0" path-parse "^1.0.6" -resolve@^1.19.0, resolve@^1.20.0, resolve@^1.9.0: +resolve@^1.12.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.9.0: version "1.22.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== @@ -7019,7 +7113,7 @@ source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, sourc resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@^0.5.0: +source-map@^0.5.0, source-map@^0.5.7: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= @@ -7153,6 +7247,11 @@ stylehacks@^5.1.0: browserslist "^4.16.6" postcss-selector-parser "^6.0.4" +stylis@4.0.13: + version "4.0.13" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91" + integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag== + stylis@^4.0.3: version "4.0.10" resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.10.tgz#446512d1097197ab3f02fb3c258358c3f7a14240" @@ -7710,7 +7809,7 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yaml@^1.10.0, yaml@^1.10.2: +yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2: version "1.10.2" resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==