midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix: show tags that will be applied if setting is 'full'

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-06-11 11:50:35 +02:00
parent 81ac619f9b
commit 0b826612e9
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Logic/State/UserRelatedState.ts
View file

@ -34,7 +34,8 @@ export default class UserRelatedState {
public readonly mangroveIdentity: MangroveIdentity public readonly mangroveIdentity: MangroveIdentity
public readonly installedUserThemes: Store<string[]> public readonly installedUserThemes: Store<string[]>
public readonly showAllQuestionsAtOnce: UIEventSource<boolean> public readonly showAllQuestionsAtOnce: UIEventSource<boolean>
public readonly showTags: UIEventSource<"no" | undefined | "always" | "yes">; public static readonly SHOW_TAGS_VALUES = ["always","yes","full"] as const
public readonly showTags: UIEventSource<"no" | undefined | "always" | "yes" | "full">;
public readonly homeLocation: FeatureSource public readonly homeLocation: FeatureSource
public readonly language: UIEventSource<string> public readonly language: UIEventSource<string>
/** /**

3
UI/Popup/TagRendering/TagRenderingQuestion.svelte
View file

@ -20,6 +20,7 @@
import {Translation} from "../../i18n/Translation"; import {Translation} from "../../i18n/Translation";
import Constants from "../../../Models/Constants"; import Constants from "../../../Models/Constants";
import {Unit} from "../../../Models/Unit"; import {Unit} from "../../../Models/Unit";
import UserRelatedState from "../../../Logic/State/UserRelatedState";
export let config: TagRenderingConfig; export let config: TagRenderingConfig;
export let tags: UIEventSource<Record<string, string>>; export let tags: UIEventSource<Record<string, string>>;
@ -220,7 +221,7 @@
</button> </button>
</slot> </slot>
</div> </div>
{#if $showTags === "yes" || $showTags === "always" || ($showTags === "" && numberOfCs >= Constants.userJourney.tagsVisibleAt) || $featureSwitchIsTesting || $featureSwitchIsDebugging} {#if UserRelatedState.SHOW_TAGS_VALUES.indexOf($showTags) >= 0 || ($showTags === "" && numberOfCs >= Constants.userJourney.tagsVisibleAt) || $featureSwitchIsTesting || $featureSwitchIsDebugging}
<span class="flex justify-between flex-wrap"> <span class="flex justify-between flex-wrap">
<TagHint {state} tags={selectedTags} currentProperties={$tags}></TagHint> <TagHint {state} tags={selectedTags} currentProperties={$tags}></TagHint>
<span class="flex flex-wrap"> <span class="flex flex-wrap">