yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-31 01:47:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Delay admin load and handle relation between plugin and main models

Browse Source
This commit is contained in:
Aurelsicoko 2017-12-07 19:12:20 +01:00
parent 9409a39fc8
commit f9cc9b504c
4 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/strapi-admin/admin/src/app.js
View File

@ -43,9 +43,6 @@ import { translationMessages, languages } from './i18n';
import { findIndex } from 'lodash';
/* eslint-enable */
// Retrieve plugins from config.
let appPlugins = plugins;
// Create redux store with history
const initialState = {};
const history = createHistory({
@ -95,7 +92,9 @@ if (window.location.port !== '4000') {
return response.json();
})
.then(plugins => {
appPlugins = plugins || [];
if (findIndex(plugins, ['id', 'users-permissions']) === -1) {
store.dispatch(setHasUserPlugin());
}
(plugins || []).forEach(plugin => {
const script = document.createElement('script');
@ -125,15 +124,13 @@ if (window.location.port !== '4000') {
.catch(err => {
console.log(err);
});
} else if (findIndex(plugins, ['id', 'users-permissions']) === -1) {
store.dispatch(setHasUserPlugin());
}
// const isPluginAllowedToRegister = (plugin) => true;
const isPluginAllowedToRegister = (plugin) => plugin.id === 'users-permissions' || plugin.id === 'email' || auth.getToken();
/**
* Public Strapi object exposed to the `window` object
*/
/**
* Register a plugin
*
@ -178,9 +175,10 @@ const displayNotification = (message, status) => {
store.dispatch(showNotification(message, status));
};
if (findIndex(appPlugins, ['id', 'users-permissions']) === -1) {
store.dispatch(setHasUserPlugin());
}
/**
* Public Strapi object exposed to the `window` object
*/
window.strapi = Object.assign(window.strapi || {}, {
remoteURL: devFrontURL || remoteURL,

16
packages/strapi-admin/admin/src/config/plugins.json
View File

@ -15,14 +15,6 @@
"test": "http://localhost:1337/admin/content-type-builder/main.js"
}
},
{
"id": "email",
"source": {
"development": "http://localhost:1337/admin/email/main.js",
"production": "http://localhost:1337/admin/email/main.js",
"test": "http://localhost:1337/admin/email/main.js"
}
},
{
"id": "settings-manager",
"source": {
@ -30,13 +22,5 @@
"production": "http://localhost:1337/admin/settings-manager/main.js",
"test": "http://localhost:1337/admin/settings-manager/main.js"
}
},
{
"id": "users-permissions",
"source": {
"development": "http://localhost:1337/admin/users-permissions/main.js",
"production": "http://localhost:1337/admin/users-permissions/main.js",
"test": "http://localhost:1337/admin/users-permissions/main.js"
}
}
]

7
packages/strapi-plugin-content-manager/admin/src/containers/App/sagas.js
View File

@ -42,10 +42,9 @@ export const generateMenu = function () {
export function* getModels() {
try {
const response = yield call(request,
`${strapi.backendURL}/content-manager/models`, {
method: 'GET',
});
const response = yield call(request, `/content-manager/models`, {
method: 'GET',
});
yield put(loadedModels(response));
} catch (err) {

12
packages/strapi-plugin-content-manager/admin/src/utils/schema.js
View File

@ -36,12 +36,18 @@ const generateSchema = (responses) => {
if (model.associations) {
// Model relations
schemaModel.relations = model.associations.reduce((acc, current) => {
const displayedAttribute = current.plugin ?
get(responses.plugins, [current.plugin, 'models', current.model || current.collection, 'info', 'mainField']) ||
findKey(get(responses.plugins, [current.plugin, 'models', current.model || current.collection, 'attributes']), { type : 'string'}) ||
'id' :
get(responses.models, [current.model || current.collection, 'info', 'mainField']) ||
findKey(get(responses.models, [current.model || current.collection, 'attributes']), { type : 'string'}) ||
'id';
acc[current.alias] = {
...current,
description: '',
displayedAttribute: get(models[current.model || current.collection], 'info.mainField') ||
findKey(models[current.model || current.collection].attributes, { type : 'string'}) ||
'id',
displayedAttribute,
};
return acc;