Remove metadata "applyMigration" option
This commit is contained in:
@@ -65,14 +65,7 @@ const getCategoryMetadataWithDefaultValueFallback = (
|
|||||||
useEffectFn?: typeof useEffect,
|
useEffectFn?: typeof useEffect,
|
||||||
): ICategoryMetadata =>
|
): ICategoryMetadata =>
|
||||||
convertGqlMetadataToAppMetadata(
|
convertGqlMetadataToAppMetadata(
|
||||||
getMetadataFrom(
|
getMetadataFrom('category', meta, convertAppMetadataToGqlMetadata(defaultMetadata), undefined, useEffectFn),
|
||||||
'category',
|
|
||||||
meta,
|
|
||||||
convertAppMetadataToGqlMetadata(defaultMetadata),
|
|
||||||
undefined,
|
|
||||||
true,
|
|
||||||
useEffectFn,
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
|
|
||||||
const getMetadata = (
|
const getMetadata = (
|
||||||
|
|||||||
@@ -81,11 +81,9 @@ export const getMetadataValueFrom = <Key extends AppMetadataKeys, Value extends
|
|||||||
key: Key,
|
key: Key,
|
||||||
defaultValue?: Value,
|
defaultValue?: Value,
|
||||||
prefixes?: string[],
|
prefixes?: string[],
|
||||||
applyMigrations?: boolean,
|
|
||||||
): Value | undefined => {
|
): Value | undefined => {
|
||||||
const requiresMigration = Number(meta?.migration) !== METADATA_MIGRATIONS.length;
|
const requiresMigration = Number(meta?.migration) !== METADATA_MIGRATIONS.length;
|
||||||
const doMigration = requiresMigration && applyMigrations;
|
const metadata = requiresMigration ? applyMetadataMigrations(meta) : meta;
|
||||||
const metadata = doMigration ? applyMetadataMigrations(meta) : meta;
|
|
||||||
|
|
||||||
if (
|
if (
|
||||||
metadata === undefined ||
|
metadata === undefined ||
|
||||||
@@ -196,7 +194,6 @@ export function getMetadataFrom<METADATA extends Partial<Metadata<AppMetadataKey
|
|||||||
metadataHolder: MetadataHolder,
|
metadataHolder: MetadataHolder,
|
||||||
metadataWithDefaultValues: METADATA,
|
metadataWithDefaultValues: METADATA,
|
||||||
prefixes?: string[],
|
prefixes?: string[],
|
||||||
applyMigrations?: boolean,
|
|
||||||
useEffectFn?: typeof useEffect,
|
useEffectFn?: typeof useEffect,
|
||||||
): METADATA;
|
): METADATA;
|
||||||
export function getMetadataFrom<METADATA extends Partial<Metadata<AppMetadataKeys, AllowedMetadataValueTypes>>>(
|
export function getMetadataFrom<METADATA extends Partial<Metadata<AppMetadataKeys, AllowedMetadataValueTypes>>>(
|
||||||
@@ -204,7 +201,6 @@ export function getMetadataFrom<METADATA extends Partial<Metadata<AppMetadataKey
|
|||||||
metadataHolder: MangaIdInfo & MetadataHolder,
|
metadataHolder: MangaIdInfo & MetadataHolder,
|
||||||
metadataWithDefaultValues: METADATA,
|
metadataWithDefaultValues: METADATA,
|
||||||
prefixes?: string[],
|
prefixes?: string[],
|
||||||
applyMigrations?: boolean,
|
|
||||||
useEffectFn?: typeof useEffect,
|
useEffectFn?: typeof useEffect,
|
||||||
): METADATA;
|
): METADATA;
|
||||||
export function getMetadataFrom<METADATA extends Partial<Metadata<AppMetadataKeys, AllowedMetadataValueTypes>>>(
|
export function getMetadataFrom<METADATA extends Partial<Metadata<AppMetadataKeys, AllowedMetadataValueTypes>>>(
|
||||||
@@ -212,7 +208,6 @@ export function getMetadataFrom<METADATA extends Partial<Metadata<AppMetadataKey
|
|||||||
metadataHolder: ChapterIdInfo & MetadataHolder,
|
metadataHolder: ChapterIdInfo & MetadataHolder,
|
||||||
metadataWithDefaultValues: METADATA,
|
metadataWithDefaultValues: METADATA,
|
||||||
prefixes?: string[],
|
prefixes?: string[],
|
||||||
applyMigrations?: boolean,
|
|
||||||
useEffectFn?: typeof useEffect,
|
useEffectFn?: typeof useEffect,
|
||||||
): METADATA;
|
): METADATA;
|
||||||
export function getMetadataFrom<METADATA extends Partial<Metadata<AppMetadataKeys, AllowedMetadataValueTypes>>>(
|
export function getMetadataFrom<METADATA extends Partial<Metadata<AppMetadataKeys, AllowedMetadataValueTypes>>>(
|
||||||
@@ -220,7 +215,6 @@ export function getMetadataFrom<METADATA extends Partial<Metadata<AppMetadataKey
|
|||||||
metadataHolder: CategoryIdInfo & MetadataHolder,
|
metadataHolder: CategoryIdInfo & MetadataHolder,
|
||||||
metadataWithDefaultValues: METADATA,
|
metadataWithDefaultValues: METADATA,
|
||||||
prefixes?: string[],
|
prefixes?: string[],
|
||||||
applyMigrations?: boolean,
|
|
||||||
useEffectFn?: typeof useEffect,
|
useEffectFn?: typeof useEffect,
|
||||||
): METADATA;
|
): METADATA;
|
||||||
export function getMetadataFrom<METADATA extends Partial<Metadata<AppMetadataKeys, AllowedMetadataValueTypes>>>(
|
export function getMetadataFrom<METADATA extends Partial<Metadata<AppMetadataKeys, AllowedMetadataValueTypes>>>(
|
||||||
@@ -228,7 +222,6 @@ export function getMetadataFrom<METADATA extends Partial<Metadata<AppMetadataKey
|
|||||||
metadataHolder: Pick<SourceType, 'id'> & MetadataHolder,
|
metadataHolder: Pick<SourceType, 'id'> & MetadataHolder,
|
||||||
metadataWithDefaultValues: METADATA,
|
metadataWithDefaultValues: METADATA,
|
||||||
prefixes?: string[],
|
prefixes?: string[],
|
||||||
applyMigrations?: boolean,
|
|
||||||
useEffectFn?: typeof useEffect,
|
useEffectFn?: typeof useEffect,
|
||||||
): METADATA;
|
): METADATA;
|
||||||
export function getMetadataFrom<METADATA extends Partial<Metadata<AppMetadataKeys, AllowedMetadataValueTypes>>>(
|
export function getMetadataFrom<METADATA extends Partial<Metadata<AppMetadataKeys, AllowedMetadataValueTypes>>>(
|
||||||
@@ -241,13 +234,11 @@ export function getMetadataFrom<METADATA extends Partial<Metadata<AppMetadataKey
|
|||||||
| (Pick<SourceType, 'id'> & MetadataHolder),
|
| (Pick<SourceType, 'id'> & MetadataHolder),
|
||||||
metadataWithDefaultValues: METADATA,
|
metadataWithDefaultValues: METADATA,
|
||||||
prefixes?: string[],
|
prefixes?: string[],
|
||||||
applyMigrations: boolean = true,
|
|
||||||
useEffectFn: typeof useEffect = (fn: () => void) => fn(),
|
useEffectFn: typeof useEffect = (fn: () => void) => fn(),
|
||||||
): METADATA {
|
): METADATA {
|
||||||
const wasMigrated =
|
const wasMigrated =
|
||||||
!!metadataHolder?.meta &&
|
!!metadataHolder?.meta &&
|
||||||
applyMigrations &&
|
Number(getMetadataValueFrom(metadataHolder, 'migration', 0)) !== METADATA_MIGRATIONS.length;
|
||||||
Number(getMetadataValueFrom(metadataHolder, 'migration', 0, undefined, true)) !== METADATA_MIGRATIONS.length;
|
|
||||||
const appMetadata = {} as METADATA;
|
const appMetadata = {} as METADATA;
|
||||||
|
|
||||||
Object.entries(metadataWithDefaultValues).forEach(([key, defaultValue]) => {
|
Object.entries(metadataWithDefaultValues).forEach(([key, defaultValue]) => {
|
||||||
@@ -256,7 +247,6 @@ export function getMetadataFrom<METADATA extends Partial<Metadata<AppMetadataKey
|
|||||||
key as AppMetadataKeys,
|
key as AppMetadataKeys,
|
||||||
defaultValue,
|
defaultValue,
|
||||||
prefixes,
|
prefixes,
|
||||||
applyMigrations,
|
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -136,7 +136,6 @@ export const getReaderSettings = (
|
|||||||
metadataHolder as Parameters<typeof getMetadataFrom>[1],
|
metadataHolder as Parameters<typeof getMetadataFrom>[1],
|
||||||
convertSettingsToMetadata(defaultSettings),
|
convertSettingsToMetadata(defaultSettings),
|
||||||
profile !== undefined ? [profile.toString()] : undefined,
|
profile !== undefined ? [profile.toString()] : undefined,
|
||||||
true,
|
|
||||||
useEffectFn,
|
useEffectFn,
|
||||||
),
|
),
|
||||||
defaultSettings as IReaderSettings,
|
defaultSettings as IReaderSettings,
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ const getMetadataServerSettingsWithDefaultFallback = (
|
|||||||
useEffectFn?: typeof useEffect,
|
useEffectFn?: typeof useEffect,
|
||||||
): MetadataServerSettings =>
|
): MetadataServerSettings =>
|
||||||
convertMetadataToSettings(
|
convertMetadataToSettings(
|
||||||
getMetadataFrom('global', { meta }, convertSettingsToMetadata(defaultSettings), undefined, true, useEffectFn),
|
getMetadataFrom('global', { meta }, convertSettingsToMetadata(defaultSettings), undefined, useEffectFn),
|
||||||
);
|
);
|
||||||
|
|
||||||
export const useMetadataServerSettings = (): {
|
export const useMetadataServerSettings = (): {
|
||||||
|
|||||||
@@ -49,7 +49,6 @@ const getMetadata = (
|
|||||||
{ ...metaHolder, meta: convertFromGqlMeta(metaHolder.meta) },
|
{ ...metaHolder, meta: convertFromGqlMeta(metaHolder.meta) },
|
||||||
convertAppMetadataToGqlMetadata(DEFAULT_SOURCE_METADATA),
|
convertAppMetadataToGqlMetadata(DEFAULT_SOURCE_METADATA),
|
||||||
undefined,
|
undefined,
|
||||||
true,
|
|
||||||
useEffectFn,
|
useEffectFn,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user