Skip to content

Commit 1f18a09

Browse files
author
Daimolean
authored
fix(web): hide map button when disable (#18743)
1 parent 0257f1a commit 1f18a09

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

web/src/lib/components/album-page/album-viewer.svelte

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<script lang="ts">
22
import { shortcut } from '$lib/actions/shortcut';
3+
import CastButton from '$lib/cast/cast-button.svelte';
34
import AlbumMap from '$lib/components/album-page/album-map.svelte';
45
import SelectAllAssets from '$lib/components/photos-page/actions/select-all-assets.svelte';
56
import AssetSelectControlBar from '$lib/components/photos-page/asset-select-control-bar.svelte';
67
import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
78
import { assetViewingStore } from '$lib/stores/asset-viewing.store';
89
import { AssetStore } from '$lib/stores/assets-store.svelte';
910
import { dragAndDropFilesStore } from '$lib/stores/drag-and-drop-files.store';
11+
import { featureFlags } from '$lib/stores/server-config.store';
1012
import { handlePromiseError } from '$lib/utils';
1113
import { cancelMultiselect, downloadAlbum } from '$lib/utils/asset-utils';
1214
import { fileUploadHandler, openFileUploadDialog } from '$lib/utils/file-uploader';
@@ -21,7 +23,6 @@
2123
import ImmichLogoSmallLink from '../shared-components/immich-logo-small-link.svelte';
2224
import ThemeButton from '../shared-components/theme-button.svelte';
2325
import AlbumSummary from './album-summary.svelte';
24-
import CastButton from '$lib/cast/cast-button.svelte';
2526
2627
interface Props {
2728
sharedLink: SharedLinkResponseDto;
@@ -121,7 +122,7 @@
121122
icon={mdiFolderDownloadOutline}
122123
/>
123124
{/if}
124-
{#if sharedLink.showMetadata}
125+
{#if sharedLink.showMetadata && $featureFlags.loaded && $featureFlags.map}
125126
<AlbumMap {album} />
126127
{/if}
127128
<ThemeButton />

web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
4545
import { assetViewingStore } from '$lib/stores/asset-viewing.store';
4646
import { AssetStore } from '$lib/stores/assets-store.svelte';
47+
import { featureFlags } from '$lib/stores/server-config.store';
4748
import { SlideshowNavigation, SlideshowState, slideshowStore } from '$lib/stores/slideshow.store';
4849
import { preferences, user } from '$lib/stores/user.store';
4950
import { handlePromiseError, makeSharedLinkUrl } from '$lib/utils';
@@ -650,7 +651,9 @@
650651
<CircleIconButton title={$t('share')} onclick={handleShare} icon={mdiShareVariantOutline} />
651652
{/if}
652653

653-
<AlbumMap {album} />
654+
{#if $featureFlags.loaded && $featureFlags.map}
655+
<AlbumMap {album} />
656+
{/if}
654657

655658
{#if album.assetCount > 0}
656659
<CircleIconButton title={$t('slideshow')} onclick={handleStartSlideshow} icon={mdiPresentationPlay} />

0 commit comments

Comments
 (0)