yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-26 06:35:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

I18N basic impl

Browse Source
This commit is contained in:
Alexandre Bodin 2021-07-19 16:47:24 +02:00
parent 6ec2896534
commit ea39cb4904
13 changed files with 57 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/core/strapi/lib/Strapi.js
View File

@ -345,15 +345,16 @@ class Strapi {
// Init core store
await this.runLifecyclesFunctions(LIFECYCLES.REGISTER);
// TODO: i18N must have added the new fileds before we init the DB
const contentTypes = [
// todo: move corestore and webhook to real models instead of content types to avoid adding extra attributes
coreStoreModel,
webhookModel,
...Object.values(strapi.models),
...Object.values(strapi.contentTypes),
...Object.values(strapi.components),
...Object.values(strapi.admin.models),
...Object.values(strapi.plugins).flatMap(plugin => Object.values(plugin.models)),
...Object.values(strapi.api).flatMap(api => Object.values(api.models)),
];
// TODO: create in RootProvider
@ -364,9 +365,6 @@ class Strapi {
await this.db.schema.sync();
await this.runLifecyclesFunctions(LIFECYCLES.REGISTER);
// await this.db.initialize();
this.store = createCoreStore({
environment: this.config.environment,
db: this.db,

6
packages/plugins/i18n/config/functions/register.js
View File

@ -23,8 +23,10 @@ module.exports = () => {
private: false,
configurable: false,
visible: false,
collection: modelName,
populate: ['_id', 'id', 'locale', PUBLISHED_AT_ATTRIBUTE],
type: 'relation',
relation: 'oneToMany',
target: contentType.uid,
// populate: ['_id', 'id', 'locale', PUBLISHED_AT_ATTRIBUTE],
});
_.set(attributes, 'locale', {

4
packages/plugins/i18n/config/policies/validateLocaleCreation.js
View File

@ -37,10 +37,10 @@ const validateLocaleCreation = async (ctx, next) => {
if (modelDef.kind === 'singleType') {
const entity = await strapi.entityService.find(modelDef.uid, {
params: { _locale: entityLocale },
params: { locale: entityLocale },
});
ctx.request.query._locale = body.locale;
ctx.request.query.locale = body.locale;
// updating
if (entity) {

16
packages/plugins/i18n/controllers/content-types.js
View File

@ -33,16 +33,22 @@ module.exports = {
let params = modelDef.kind === 'singleType' ? {} : { id };
const entity = await strapi.query(model).findOne(params);
const entity = await strapi
.query(model)
.findOne({ where: params, populate: ['localizations'] });
if (!entity) {
return ctx.notFound();
}
const permissions = await strapi.admin.services.permission.find({
action_in: [READ_ACTION, CREATE_ACTION],
subject: model,
role_in: user.roles.map(prop('id')),
const permissions = await strapi.admin.services.permission.findMany({
where: {
action: [READ_ACTION, CREATE_ACTION],
subject: model,
role: {
id: user.roles.map(prop('id')),
},
},
});
const localePermissions = permissions

2
packages/plugins/i18n/services/__tests__/entity-service-decorator.test.js
View File

@ -152,7 +152,7 @@ describe('Entity service decorator', () => {
const input = {
params: {
_locale: 'fr',
locale: 'fr',
},
populate: ['test'],
};

6
packages/plugins/i18n/services/content-types.js
View File

@ -54,9 +54,11 @@ const getAndValidateRelatedEntity = async (relatedEntityId, model, locale) => {
let relatedEntity;
if (kind === 'singleType') {
relatedEntity = await strapi.query(model).findOne({});
relatedEntity = await strapi.query(model).findOne({ populate: ['localizations'] });
} else if (relatedEntityId) {
relatedEntity = await strapi.query(model).findOne({ id: relatedEntityId });
relatedEntity = await strapi
.query(model)
.findOne({ where: { id: relatedEntityId }, populate: ['localizations'] });
}
if (relatedEntityId && !relatedEntity) {

6
packages/plugins/i18n/services/core-api.js
View File

@ -142,7 +142,7 @@ const createLocalizationHandler = contentType => {
if (isSingleType(contentType)) {
return async function(ctx) {
const entry = await strapi.query(contentType.uid).findOne();
const entry = await strapi.query(contentType.uid).findOne({ populate: ['localizations'] });
if (!entry) {
throw strapi.errors.notFound('baseEntryId.invalid');
@ -155,7 +155,9 @@ const createLocalizationHandler = contentType => {
return async function(ctx) {
const { id: baseEntryId } = ctx.params;
const entry = await strapi.query(contentType.uid).findOne({ id: baseEntryId });
const entry = await strapi
.query(contentType.uid)
.findOne({ where: { id: baseEntryId }, populate: ['localizations'] });
if (!entry) {
throw strapi.errors.notFound('baseEntryId.invalid');

19
packages/plugins/i18n/services/entity-service-decorator.js
View File

@ -5,20 +5,19 @@ const { getService } = require('../utils');
const { syncLocalizations, syncNonLocalizedAttributes } = require('./localizations');
const LOCALE_QUERY_FILTER = '_locale';
const LOCALE_QUERY_FILTER = 'locale';
const SINGLE_ENTRY_ACTIONS = ['findOne', 'update', 'delete'];
const BULK_ACTIONS = ['delete'];
const paramsContain = (key, params) => {
return (
has(key, params) ||
has(key, params._where) ||
(isArray(params._where) && params._where.some(clause => has(key, clause)))
has(key, params.filters) ||
(isArray(params.filters) && params.filters.some(clause => has(key, clause)))
);
};
/**
* Adds default locale or replaces _locale by locale in query params
* Adds default locale or replaces locale by locale in query params
* @param {object} params - query params
*/
// TODO: fix
@ -32,12 +31,14 @@ const wrapParams = async (params = {}, ctx = {}) => {
return {
...omit(LOCALE_QUERY_FILTER, params),
locale: params[LOCALE_QUERY_FILTER],
filters: {
$and: [params.filters || {}, { locale: params[LOCALE_QUERY_FILTER] }],
},
};
}
const entityDefinedById = paramsContain('id', params) && SINGLE_ENTRY_ACTIONS.includes(action);
const entitiesDefinedByIds = paramsContain('id_in', params) && BULK_ACTIONS.includes(action);
const entitiesDefinedByIds = paramsContain('id.$in', params) && BULK_ACTIONS.includes(action);
if (entityDefinedById || entitiesDefinedByIds) {
return params;
@ -47,7 +48,9 @@ const wrapParams = async (params = {}, ctx = {}) => {
return {
...params,
locale: await getDefaultLocale(),
filters: {
$and: [params.filters || {}, { locale: await getDefaultLocale() }],
},
};
};

6
packages/plugins/i18n/services/localizations.js
View File

@ -29,7 +29,7 @@ const syncLocalizations = async (entry, { model }) => {
const updateLocalization = id => {
const localizations = newLocalizations.filter(localizationId => localizationId !== id);
return strapi.query(model.uid).update({ id }, { localizations });
return strapi.query(model.uid).update({ where: { id }, data: { localizations } });
};
await Promise.all(entry.localizations.map(({ id }) => updateLocalization(id)));
@ -52,7 +52,9 @@ const syncNonLocalizedAttributes = async (entry, { model }) => {
return;
}
const updateLocalization = id => strapi.query(model.uid).update({ id }, nonLocalizedAttributes);
const updateLocalization = id => {
return strapi.query(model.uid).update({ where: { id }, data: nonLocalizedAttributes });
};
await Promise.all(entry.localizations.map(({ id }) => updateLocalization(id)));
}

9
packages/plugins/i18n/services/permissions/actions.js
View File

@ -82,9 +82,12 @@ const syncSuperAdminPermissionsWithLocales = async () => {
return;
}
// TODO: fix
const superAdminPermissions = await permissionService.findUserPermissions({
roles: [superAdminRole],
const superAdminPermissions = await permissionService.findMany({
where: {
role: {
id: superAdminRole.id,
},
},
});
const newSuperAdminPermissions = await addAllLocalesToPermissions(superAdminPermissions);

2
packages/plugins/i18n/tests/content-manager/list-relation.test.e2e.js
View File

@ -111,7 +111,7 @@ describe('i18n - Relation-list route', () => {
const res = await rq({
method: 'POST',
url: '/content-manager/relations/application::shop.shop/products',
qs: { _locale: 'it' },
qs: { locale: 'it' },
});
expect(res.body).toHaveLength(1);

2
packages/plugins/i18n/tests/graphql.test.e2e.js
View File

@ -51,7 +51,7 @@ describe('Test Graphql API create localization', () => {
afterAll(async () => {
await strapi.query('plugins::i18n.locale').delete({ where: { id: localeId } });
await strapi.query('recipes').deleteMany();
await strapi.query('application::recipes.recipes').deleteMany();
await strapi.destroy();
await builder.cleanup();
});

6
packages/plugins/i18n/tests/locales.test.e2e.js
View File

@ -365,7 +365,7 @@ describe('CRUD locales', () => {
} = await rq({
url: '/content-manager/collection-types/application::product.product',
method: 'GET',
qs: { _locale: 'fr-FR' },
qs: { locale: 'fr-FR' },
});
expect(createdProducts).toHaveLength(1);
@ -381,7 +381,7 @@ describe('CRUD locales', () => {
} = await rq({
url: '/content-manager/collection-types/application::product.product',
method: 'GET',
qs: { _locale: 'fr-FR' },
qs: { locale: 'fr-FR' },
});
expect(frenchProducts).toHaveLength(0);
@ -390,7 +390,7 @@ describe('CRUD locales', () => {
} = await rq({
url: '/content-manager/collection-types/application::product.product',
method: 'GET',
qs: { _locale: 'en' },
qs: { locale: 'en' },
});
expect(englishProducts).toHaveLength(1);