Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(history): simplify the meta object #19990

Merged
merged 3 commits into from
Apr 2, 2024
Merged

chore(history): simplify the meta object #19990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40a2806
chore(history): simplify the meta object
markkaylor Apr 2, 2024
0066ecd
fix: update tests
markkaylor Apr 2, 2024
2f5ef6d
fix: update fe tests
markkaylor Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions packages/core/content-manager/admin/src/history/components/tests/VersionHeader.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ describe('VersionHeader', () => {
data: {
title: 'Test Title',
},
meta: {
unknownAttributes: {
added: {},
removed: {},
},
},
};

it('should display the correct title and subtitle for a non-localized entry', () => {
Expand Down Expand Up @@ -130,6 +136,12 @@ describe('VersionHeader', () => {
data: {
title: 'Test Title',
},
meta: {
unknownAttributes: {
added: {},
removed: {},
},
},
};

it('should display the correct title and subtitle for a non-localized entry', () => {
Expand Down
6 changes: 3 additions & 3 deletions packages/core/content-manager/server/src/history/services/__tests__/history.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { UID } from '@strapi/types';
import type { Struct, UID } from '@strapi/types';
import { scheduleJob } from 'node-schedule';
import { HISTORY_VERSION_UID } from '../../constants';
import { createHistoryService } from '../history';
Expand Down Expand Up @@ -188,7 +188,7 @@ describe('history-version service', () => {
title: {
type: 'string',
},
},
} as Struct.SchemaAttributes,
status: 'draft' as const,
};

Expand Down Expand Up @@ -216,7 +216,7 @@ describe('history-version service', () => {
title: {
type: 'string',
},
},
} as Struct.SchemaAttributes,
status: null,
};

Expand Down
13 changes: 6 additions & 7 deletions packages/core/content-manager/server/src/history/services/history.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,15 +175,14 @@ const createHistoryService = ({ strapi }: { strapi: Core.LoadedStrapi }) => {
]);

const versionsWithMeta = results.map((version) => {
const { added, removed } = getSchemaAttributesDiff(
version.schema,
strapi.getModel(params.contentType).attributes
);
const hasSchemaDiff = Object.keys(added).length > 0 || Object.keys(removed).length > 0;

return {
...version,
...(hasSchemaDiff ? { meta: { unknownAttributes: { added, removed } } } : {}),
meta: {
unknownAttributes: getSchemaAttributesDiff(
version.schema,
strapi.getModel(params.contentType).attributes
),
},
};
});

Expand Down
12 changes: 6 additions & 6 deletions packages/core/content-manager/shared/contracts/history-versions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Data, UID } from '@strapi/types';
import type { Data, Struct, UID } from '@strapi/types';
import { type errors } from '@strapi/utils';

/**
Expand All @@ -12,7 +12,7 @@ export interface CreateHistoryVersion {
locale: string | null;
status: 'draft' | 'published' | 'modified' | null;
data: Record<string, unknown>;
schema: Record<string, unknown>;
schema: Struct.SchemaAttributes;
}
markkaylor marked this conversation as resolved.
Show resolved Hide resolved

interface Locale {
Expand All @@ -31,10 +31,10 @@ export interface HistoryVersionDataResponse extends Omit<CreateHistoryVersion, '
email: string;
};
locale: Locale | null;
meta?: {
unknownAttributes?: {
added: Record<string, unknown>;
removed: Record<string, unknown>;
meta: {
unknownAttributes: {
added: Struct.SchemaAttributes;
removed: Struct.SchemaAttributes;
};
};
}
Expand Down