yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 15:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix PR feedback

Browse Source 
Signed-off-by: soupette <cyril.lpz@gmail.com>
This commit is contained in:
soupette 2020-07-16 11:31:26 +02:00
parent cd55915642
commit 9347083625
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/strapi-admin/admin/src/containers/SettingsPage/utils/findFirstAllowedEndpoint.js
View File

@ -1,6 +1,6 @@
import { flatten } from 'lodash';
import { flatMap } from 'lodash';
const generateArrayOfLinks = array => flatten(array.map(({ links }) => links));
const generateArrayOfLinks = array => flatMap(array, 'links');
const findFirstAllowedEndpoint = menuArray => {
const arrayOfLinks = generateArrayOfLinks(menuArray);

38
scripts/front/reorder-admin-translation-files.js
View File

@ -5,8 +5,8 @@ const glob = promisify(require('glob').glob);
async function orderTrads({ mainTranslationFile, translationFiles }) {
const data = await fs.readJSON(mainTranslationFile);
const orderedData = Object.keys(data)
const orderedData = Object.keys(data)
.sort()
.reduce((acc, current) => {
acc[current] = data[current];
@ -16,25 +16,31 @@ async function orderTrads({ mainTranslationFile, translationFiles }) {
await fs.writeJSON(mainTranslationFile, orderedData, { spaces: 2 });
await Promise.all(
translationFiles.map(async trad => {
const cleanedFile = Object.keys(orderedData).reduce((acc, current) => {
const currentTrad = fs.readJsonSync(trad);
if (currentTrad[current]) {
acc[current] = currentTrad[current];
}
return acc;
}, {});
const cleanFile = async trad => {
const cleanedFile = {};
const orderedDataKeys = Object.keys(orderedData);
for (let i in orderedDataKeys) {
try {
await fs.writeJSON(trad, cleanedFile, { spaces: 2 });
const currentTrad = await fs.readJson(trad);
const currentKey = orderedDataKeys[i];
if (currentTrad[currentKey]) {
cleanedFile[currentKey] = currentTrad[currentKey];
}
} catch (err) {
console.log(err);
console.error(err);
}
})
);
}
try {
await fs.writeJSON(trad, cleanedFile, { spaces: 2 });
} catch (err) {
console.error(err);
}
};
await Promise.all(translationFiles.map(trad => cleanFile(trad)));
}
async function run() {