IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Login:Components:WizardForm: change types for portalCultures and portalTimeZones

Browse Source
This commit is contained in:
Darya Umrikhina 2024-08-13 16:43:48 +04:00
parent 0a87bbdc75
commit b2b7e326c2
1 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
packages/login/src/components/WizardForm/index.tsx
View File

@ -48,7 +48,11 @@ import { FileInput } from "@docspace/shared/components/file-input";
import { IconButton } from "@docspace/shared/components/icon-button"; import { IconButton } from "@docspace/shared/components/icon-button";
import { Link, LinkTarget, LinkType } from "@docspace/shared/components/link"; import { Link, LinkTarget, LinkType } from "@docspace/shared/components/link";
import { setLicense } from "@docspace/shared/api/settings"; import { setLicense } from "@docspace/shared/api/settings";
import { ComboBox, ComboBoxSize } from "@docspace/shared/components/combobox"; import {
ComboBox,
ComboBoxSize,
TOption,
} from "@docspace/shared/components/combobox";
import BetaBadge from "@docspace/client/src/components/BetaBadgeWrapper"; import BetaBadge from "@docspace/client/src/components/BetaBadgeWrapper";
import { Checkbox } from "@docspace/shared/components/checkbox"; import { Checkbox } from "@docspace/shared/components/checkbox";
import { Button, ButtonSize } from "@docspace/shared/components/button"; import { Button, ButtonSize } from "@docspace/shared/components/button";
@ -97,8 +101,8 @@ function WizardForm(props: WizardFormProps) {
const [selectedLanguage, setSelectedLanguage] = useState<TCulturesOption>( const [selectedLanguage, setSelectedLanguage] = useState<TCulturesOption>(
DEFAULT_SELECT_LANGUAGE, DEFAULT_SELECT_LANGUAGE,
); );
const [cultures, setCultures] = useState<TCulturesOption[]>(); const [cultures, setCultures] = useState<TOption[]>();
const [timezones, setTimezones] = useState<TTimeZoneOption[]>(); const [timezones, setTimezones] = useState<TOption[]>();
const [email, setEmail] = useState(""); const [email, setEmail] = useState("");
const [hasErrorEmail, setHasErrorEmail] = useState(false); const [hasErrorEmail, setHasErrorEmail] = useState(false);
@ -142,12 +146,23 @@ function WizardForm(props: WizardFormProps) {
if (portalCultures) { if (portalCultures) {
const cultures = mapCulturesToArray(portalCultures, true, i18n); const cultures = mapCulturesToArray(portalCultures, true, i18n);
const select = cultures.filter((lang) => lang.key === convertedCulture); const select = cultures.filter((lang) => lang.key === convertedCulture);
setCultures(cultures); setCultures(
cultures.map((culture) => ({
key: culture.key,
label: "label" in culture ? culture.label : "",
icon: culture.icon,
})),
);
if (select.length === 0) { if (select.length === 0) {
setSelectedLanguage(DEFAULT_SELECT_LANGUAGE); setSelectedLanguage(DEFAULT_SELECT_LANGUAGE);
} else { } else {
setSelectedLanguage(select[0]); const culture = select[0];
setSelectedLanguage({
key: culture.key,
label: "label" in culture ? culture.label : "",
icon: culture.icon,
});
} }
} }
}, [convertedCulture, i18n, portalCultures]); }, [convertedCulture, i18n, portalCultures]);
@ -175,12 +190,26 @@ function WizardForm(props: WizardFormProps) {
refPassInput.current.onGeneratePassword(e); refPassInput.current.onGeneratePassword(e);
}; };
const onLanguageSelect = (lang: TCulturesOption) => { const onLanguageSelect = (lang: TOption) => {
setSelectedLanguage(lang); const cultures = mapCulturesToArray(portalCultures!, true, i18n);
const select = cultures.filter((culture) => culture.key === lang.key);
if (select.length === 0) {
setSelectedLanguage(DEFAULT_SELECT_LANGUAGE);
} else {
const culture = select[0];
setSelectedLanguage({
key: culture.key,
label: "label" in culture ? culture.label : "",
icon: culture.icon,
});
}
}; };
const onTimezoneSelect = (timezone: TTimeZoneOption) => { const onTimezoneSelect = (timezone: TOption) => {
setSelectedTimezone(timezone); setSelectedTimezone({
key: timezone.key,
label: timezone.label ?? "",
});
}; };
const onLicenseFileHandler = (file: File | File[]) => { const onLicenseFileHandler = (file: File | File[]) => {
@ -259,7 +288,6 @@ function WizardForm(props: WizardFormProps) {
}); });
window.location.replace("/"); window.location.replace("/");
//setWizardComplete();
} catch (error) { } catch (error) {
setError(error); setError(error);
setIsCreated(false); setIsCreated(false);
@ -382,7 +410,7 @@ function WizardForm(props: WizardFormProps) {
withoutPadding withoutPadding
directionY="both" directionY="both"
options={cultures || []} options={cultures || []}
selectedOption={selectedLanguage} selectedOption={selectedLanguage as TOption}
onSelect={onLanguageSelect} onSelect={onLanguageSelect}
isDisabled={isCreated} isDisabled={isCreated}
scaled={isMobileView} scaled={isMobileView}