diff --git a/src/modules/category/services/CategoryMetadata.ts b/src/modules/category/services/CategoryMetadata.ts index ea49f04e..64ce4b3f 100644 --- a/src/modules/category/services/CategoryMetadata.ts +++ b/src/modules/category/services/CategoryMetadata.ts @@ -65,14 +65,7 @@ const getCategoryMetadataWithDefaultValueFallback = ( useEffectFn?: typeof useEffect, ): ICategoryMetadata => convertGqlMetadataToAppMetadata( - getMetadataFrom( - 'category', - meta, - convertAppMetadataToGqlMetadata(defaultMetadata), - undefined, - true, - useEffectFn, - ), + getMetadataFrom('category', meta, convertAppMetadataToGqlMetadata(defaultMetadata), undefined, useEffectFn), ); const getMetadata = ( diff --git a/src/modules/metadata/services/MetadataReader.ts b/src/modules/metadata/services/MetadataReader.ts index ea7fedae..212829de 100644 --- a/src/modules/metadata/services/MetadataReader.ts +++ b/src/modules/metadata/services/MetadataReader.ts @@ -81,11 +81,9 @@ export const getMetadataValueFrom = { const requiresMigration = Number(meta?.migration) !== METADATA_MIGRATIONS.length; - const doMigration = requiresMigration && applyMigrations; - const metadata = doMigration ? applyMetadataMigrations(meta) : meta; + const metadata = requiresMigration ? applyMetadataMigrations(meta) : meta; if ( metadata === undefined || @@ -196,7 +194,6 @@ export function getMetadataFrom>>( @@ -204,7 +201,6 @@ export function getMetadataFrom>>( @@ -212,7 +208,6 @@ export function getMetadataFrom>>( @@ -220,7 +215,6 @@ export function getMetadataFrom>>( @@ -228,7 +222,6 @@ export function getMetadataFrom & MetadataHolder, metadataWithDefaultValues: METADATA, prefixes?: string[], - applyMigrations?: boolean, useEffectFn?: typeof useEffect, ): METADATA; export function getMetadataFrom>>( @@ -241,13 +234,11 @@ export function getMetadataFrom & MetadataHolder), metadataWithDefaultValues: METADATA, prefixes?: string[], - applyMigrations: boolean = true, useEffectFn: typeof useEffect = (fn: () => void) => fn(), ): METADATA { const wasMigrated = !!metadataHolder?.meta && - applyMigrations && - Number(getMetadataValueFrom(metadataHolder, 'migration', 0, undefined, true)) !== METADATA_MIGRATIONS.length; + Number(getMetadataValueFrom(metadataHolder, 'migration', 0)) !== METADATA_MIGRATIONS.length; const appMetadata = {} as METADATA; Object.entries(metadataWithDefaultValues).forEach(([key, defaultValue]) => { @@ -256,7 +247,6 @@ export function getMetadataFrom[1], convertSettingsToMetadata(defaultSettings), profile !== undefined ? [profile.toString()] : undefined, - true, useEffectFn, ), defaultSettings as IReaderSettings, diff --git a/src/modules/settings/services/ServerSettingsMetadata.ts b/src/modules/settings/services/ServerSettingsMetadata.ts index 5a9ab4c8..370136c7 100644 --- a/src/modules/settings/services/ServerSettingsMetadata.ts +++ b/src/modules/settings/services/ServerSettingsMetadata.ts @@ -51,7 +51,7 @@ const getMetadataServerSettingsWithDefaultFallback = ( useEffectFn?: typeof useEffect, ): MetadataServerSettings => convertMetadataToSettings( - getMetadataFrom('global', { meta }, convertSettingsToMetadata(defaultSettings), undefined, true, useEffectFn), + getMetadataFrom('global', { meta }, convertSettingsToMetadata(defaultSettings), undefined, useEffectFn), ); export const useMetadataServerSettings = (): { diff --git a/src/modules/source/services/SourceMetadata.ts b/src/modules/source/services/SourceMetadata.ts index 2fb3b399..91f19185 100644 --- a/src/modules/source/services/SourceMetadata.ts +++ b/src/modules/source/services/SourceMetadata.ts @@ -49,7 +49,6 @@ const getMetadata = ( { ...metaHolder, meta: convertFromGqlMeta(metaHolder.meta) }, convertAppMetadataToGqlMetadata(DEFAULT_SOURCE_METADATA), undefined, - true, useEffectFn, ), );