contrapunctus/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Add more checks in the import helper after user testing

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-03-24 03:11:29 +01:00
parent 2dac893bb3
commit 9617dbc34d
15 changed files with 344 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

10
UI/ImportFlow/LoginToImport.ts
View file

@ -12,6 +12,7 @@ import Toggle from "../Input/Toggle";
import {SubtleButton} from "../Base/SubtleButton";
import Svg from "../../Svg";
import MoreScreen from "../BigComponents/MoreScreen";
import CheckBoxes from "../Input/Checkboxes";
export default class LoginToImport extends Combine implements FlowStep<UserRelatedState> {
readonly IsValid: UIEventSource<boolean>;
@ -21,7 +22,9 @@ export default class LoginToImport extends Combine implements FlowStep<UserRelat
constructor(state: UserRelatedState) {
const t = Translations.t.importHelper
const isValid = state.osmConnection.userDetails.map(ud => LoginToImport.whitelist.indexOf(ud.uid) >= 0 || ud.csCount >= Constants.userJourney.importHelperUnlock)
const check = new CheckBoxes([new VariableUiElement(state.osmConnection.userDetails.map(ud => t.loginIsCorrect.Subs(ud)))])
const isValid = state.osmConnection.userDetails.map(ud =>
LoginToImport.whitelist.indexOf(ud.uid) >= 0 || ud.csCount >= Constants.userJourney.importHelperUnlock)
super([
new Title(t.userAccountTitle),
new LoginToggle(
@ -33,7 +36,8 @@ export default class LoginToImport extends Combine implements FlowStep<UserRelat
new Img(ud.img ?? "./assets/svgs/help.svg").SetClass("w-16 h-16 rounded-full"),
t.loggedInWith.Subs(ud),
new SubtleButton(Svg.logout_svg().SetClass("h-8"), Translations.t.general.logout)
.onClick(() => state.osmConnection.LogOut())
.onClick(() => state.osmConnection.LogOut()),
check
]);
})),
t.loginRequired,
@ -46,6 +50,6 @@ export default class LoginToImport extends Combine implements FlowStep<UserRelat
, isValid)
])
this.Value = new UIEventSource<UserRelatedState>(state)
this.IsValid = isValid;
this.IsValid = isValid.map(isValid => isValid && check.GetValue().data.length > 0, [check.GetValue()]);
}
}