High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix: feature flags manager race condition (#23973)
Daniel Dietzler5f987a95f510
diff --git a/web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/+page.svelteindex dd5cbe8b8f..fd443a6470 100644--- a/web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/+page.svelte+++ b/web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/+page.svelte@@ -1,6 +1,7 @@<script lang="ts">+ import { goto } from '$app/navigation';import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';- import { timeToLoadTheMap } from '$lib/constants';+ import { AppRoute, timeToLoadTheMap } from '$lib/constants';import Portal from '$lib/elements/Portal.svelte';import { featureFlagsManager } from '$lib/managers/feature-flags-manager.svelte';import { assetViewingStore } from '$lib/stores/asset-viewing.store';@@ -26,6 +27,10 @@assetViewingStore.showAssetViewer(false);});+ if (!featureFlagsManager.value.map) {+ handlePromiseError(goto(AppRoute.PHOTOS));+ }+async function onViewAssets(assetIds: string[]) {viewingAssets = assetIds;viewingAssetCursor = 0;diff --git a/web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/+page.ts b/web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/+page.tsindex e797c4d8b6..add9882bcd 100644--- a/web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/+page.ts+++ b/web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/+page.ts@@ -1,7 +1,3 @@-import { goto } from '$app/navigation';-import { AppRoute } from '$lib/constants';-import { featureFlagsManager } from '$lib/managers/feature-flags-manager.svelte';-import { handlePromiseError } from '$lib/utils';import { authenticate } from '$lib/utils/auth';import { getFormatter } from '$lib/utils/i18n';import { getAssetInfoFromParam } from '$lib/utils/navigation';@@ -12,10 +8,6 @@ export const load = (async ({ params, url }) => {const asset = await getAssetInfoFromParam(params);const $t = await getFormatter();- if (!featureFlagsManager.value.map) {- handlePromiseError(goto(AppRoute.PHOTOS));- }-return {asset,meta: {diff --git a/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.svelteindex b9019d3274..df91ef8dc4 100644--- a/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.svelte+++ b/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.svelte@@ -1,4 +1,5 @@<script lang="ts">+ import { goto } from '$app/navigation';import empty3Url from '$lib/assets/empty-3.svg';import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';@@ -7,10 +8,12 @@import SelectAllAssets from '$lib/components/timeline/actions/SelectAllAction.svelte';import AssetSelectControlBar from '$lib/components/timeline/AssetSelectControlBar.svelte';import Timeline from '$lib/components/timeline/Timeline.svelte';+ import { AppRoute } from '$lib/constants';import { featureFlagsManager } from '$lib/managers/feature-flags-manager.svelte';import { serverConfigManager } from '$lib/managers/server-config-manager.svelte';import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';+ import { handlePromiseError } from '$lib/utils';import { handleError } from '$lib/utils/handle-error';import { emptyTrash, restoreTrash } from '@immich/sdk';import { Button, HStack, modalManager, Text, toastManager } from '@immich/ui';@@ -29,6 +32,10 @@const assetInteraction = new AssetInteraction();+ if (!featureFlagsManager.value.trash) {+ handlePromiseError(goto(AppRoute.PHOTOS));+ }+const handleEmptyTrash = async () => {const isConfirmed = await modalManager.showDialog({ prompt: $t('empty_trash_confirmation') });if (!isConfirmed) {diff --git a/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.ts b/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.tsindex eddf9aa6af..79c41892c7 100644--- a/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.ts+++ b/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.ts@@ -1,7 +1,3 @@-import { goto } from '$app/navigation';-import { AppRoute } from '$lib/constants';-import { featureFlagsManager } from '$lib/managers/feature-flags-manager.svelte';-import { handlePromiseError } from '$lib/utils';import { authenticate } from '$lib/utils/auth';import { getFormatter } from '$lib/utils/i18n';import { getAssetInfoFromParam } from '$lib/utils/navigation';@@ -12,10 +8,6 @@ export const load = (async ({ params, url }) => {const asset = await getAssetInfoFromParam(params);const $t = await getFormatter();- if (!featureFlagsManager.value.trash) {- handlePromiseError(goto(AppRoute.PHOTOS));- }-return {asset,meta: {