yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-22 23:09:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add telemetry back

Browse Source 
Signed-off-by: soupette <cyril.lpz@gmail.com>
This commit is contained in:
soupette 2021-02-22 12:05:21 +01:00
parent 6ea3093221
commit 9626c72268
6 changed files with 106 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/strapi-admin/admin/src/components/Roles/ContentTypeCollapse/utils/activeStyle.js
View File

@ -1,4 +1,3 @@
// import styled from 'styled-components';
import { Text } from '@buffetjs/core'; import { Text } from '@buffetjs/core';
import Chevron from '../../Chevron'; import Chevron from '../../Chevron';

26
packages/strapi-admin/admin/src/components/Roles/Permissions/index.js
View File

@ -1,5 +1,7 @@
import React, { forwardRef, memo, useCallback, useImperativeHandle, useReducer } from 'react'; import React, { forwardRef, memo, useCallback, useImperativeHandle, useReducer } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { difference } from 'strapi-helper-plugin';
import { has, isEmpty } from 'lodash';
import Tabs from '../Tabs'; import Tabs from '../Tabs';
import PermissionsDataManagerProvider from '../PermissionsDataManagerProvider'; import PermissionsDataManagerProvider from '../PermissionsDataManagerProvider';
import ContentTypes from '../ContentTypes'; import ContentTypes from '../ContentTypes';
@ -11,14 +13,34 @@ import init from './init';
import reducer, { initialState } from './reducer'; import reducer, { initialState } from './reducer';
const Permissions = forwardRef(({ layout, isFormDisabled, permissions }, ref) => { const Permissions = forwardRef(({ layout, isFormDisabled, permissions }, ref) => {
const [{ layouts, modifiedData }, dispatch] = useReducer(reducer, initialState, () => const [{ initialData, layouts, modifiedData }, dispatch] = useReducer(reducer, initialState, () =>
init(layout, permissions) init(layout, permissions)
); );
useImperativeHandle(ref, () => { useImperativeHandle(ref, () => {
return { return {
getPermissions: () => { getPermissions: () => {
return formatPermissionsToAPI(modifiedData); const collectionTypesDiff = difference(
initialData.collectionTypes,
modifiedData.collectionTypes
);
const singleTypesDiff = difference(initialData.singleTypes, modifiedData.singleTypes);
const contentTypesDiff = { ...collectionTypesDiff, ...singleTypesDiff };
let didUpdateConditions;
if (isEmpty(contentTypesDiff)) {
didUpdateConditions = false;
} else {
didUpdateConditions = Object.values(contentTypesDiff).some(permission => {
return Object.values(permission).some(permissionValue =>
has(permissionValue, 'conditions')
);
});
}
return { permissionsToSend: formatPermissionsToAPI(modifiedData), didUpdateConditions };
}, },
resetForm: () => { resetForm: () => {
dispatch({ type: 'RESET_FORM' }); dispatch({ type: 'RESET_FORM' });

1
packages/strapi-admin/admin/src/config.js
View File

@ -10,5 +10,4 @@
export const LOGIN_LOGO = null; export const LOGIN_LOGO = null;
export const SHOW_TUTORIALS = true; export const SHOW_TUTORIALS = true;
export const SETTINGS_BASE_URL = '/settings'; export const SETTINGS_BASE_URL = '/settings';
// TODO
export const STRAPI_UPDATE_NOTIF = true; export const STRAPI_UPDATE_NOTIF = true;

31
packages/strapi-admin/admin/src/containers/Roles/EditPage/index.js
View File

@ -14,11 +14,7 @@ import schema from './utils/schema';
const EditPage = () => { const EditPage = () => {
const { formatMessage } = useIntl(); const { formatMessage } = useIntl();
const { const { emitEvent, settingsBaseURL } = useGlobalContext();
// TODO
// emitEvent,
settingsBaseURL,
} = useGlobalContext();
const { const {
params: { id }, params: { id },
} = useRouteMatch(`${settingsBaseURL}/roles/:id`); } = useRouteMatch(`${settingsBaseURL}/roles/:id`);
@ -74,23 +70,7 @@ const EditPage = () => {
strapi.lockAppWithOverlay(); strapi.lockAppWithOverlay();
setIsSubmiting(true); setIsSubmiting(true);
const permissionsToSend = permissionsRef.current.getPermissions(); const { permissionsToSend, didUpdateConditions } = permissionsRef.current.getPermissions();
// TODO
// const checkConditionsDiff = () => {
// const diff = difference(
// get(permissionsToSend, 'contentTypesPermissions', {}),
// get(rolePermissions, 'contentTypesPermissions', {})
// );
// if (isEmpty(diff)) {
// return false;
// }
// return Object.keys(diff).some(key => {
// return has(diff, [key, 'conditions']);
// });
// };
await request(`/admin/roles/${id}`, { await request(`/admin/roles/${id}`, {
method: 'PUT', method: 'PUT',
@ -105,10 +85,9 @@ const EditPage = () => {
}, },
}); });
// TODO if (didUpdateConditions) {
// if (checkConditionsDiff()) { emitEvent('didUpdateConditions');
// emitEvent('didUpdateConditions'); }
// }
} }
permissionsRef.current.setFormAfterSubmit(); permissionsRef.current.setFormAfterSubmit();

138
packages/strapi-admin/admin/src/translations/index.js
View File

@ -1,83 +1,83 @@
// import ar from './ar.json'; import ar from './ar.json';
// import cs from './cs.json'; import cs from './cs.json';
// import de from './de.json'; import de from './de.json';
// import dk from './dk.json'; import dk from './dk.json';
import en from './en.json'; import en from './en.json';
// import es from './es.json'; import es from './es.json';
import fr from './fr.json'; import fr from './fr.json';
// import he from './he.json'; import he from './he.json';
// import id from './id.json'; import id from './id.json';
// import it from './it.json'; import it from './it.json';
// import ja from './ja.json'; import ja from './ja.json';
// import ko from './ko.json'; import ko from './ko.json';
// import ms from './ms.json'; import ms from './ms.json';
// import nl from './nl.json'; import nl from './nl.json';
// import pl from './pl.json'; import pl from './pl.json';
// import ptBR from './pt-BR.json'; import ptBR from './pt-BR.json';
// import pt from './pt.json'; import pt from './pt.json';
// import ru from './ru.json'; import ru from './ru.json';
// import th from './th.json'; import th from './th.json';
// import tr from './tr.json'; import tr from './tr.json';
// import vi from './vi.json'; import vi from './vi.json';
// import zhHans from './zh-Hans.json'; import zhHans from './zh-Hans.json';
// import zh from './zh.json'; import zh from './zh.json';
// import sk from './sk.json'; import sk from './sk.json';
// import uk from './uk.json'; import uk from './uk.json';
const trads = { const trads = {
// ar, ar,
// cs, cs,
// de, de,
// dk, dk,
en, en,
// es, es,
fr, fr,
// he, he,
// id, id,
// it, it,
// ja, ja,
// ko, ko,
// ms, ms,
// nl, nl,
// pl, pl,
// 'pt-BR': ptBR, 'pt-BR': ptBR,
// pt, pt,
// ru, ru,
// sk, sk,
// th, th,
// tr, tr,
// uk, uk,
// vi, vi,
// 'zh-Hans': zhHans, 'zh-Hans': zhHans,
// zh, zh,
}; };
export const languageNativeNames = { export const languageNativeNames = {
// ar: 'العربية', ar: 'العربية',
// cs: 'Čeština', cs: 'Čeština',
// de: 'Deutsch', de: 'Deutsch',
// dk: 'Dansk', dk: 'Dansk',
en: 'English', en: 'English',
// es: 'Español', es: 'Español',
fr: 'Français', fr: 'Français',
// he: 'עברית', he: 'עברית',
// id: 'Indonesian', id: 'Indonesian',
// it: 'Italiano', it: 'Italiano',
// ja: '日本語', ja: '日本語',
// ko: '한국어', ko: '한국어',
// ms: 'Melayu', ms: 'Melayu',
// nl: 'Nederlands', nl: 'Nederlands',
// pl: 'Polski', pl: 'Polski',
// 'pt-BR': 'Português (Brasil)', 'pt-BR': 'Português (Brasil)',
// pt: 'Português (Portugal)', pt: 'Português (Portugal)',
// ru: 'Русский', ru: 'Русский',
// sk: 'Slovenčina', sk: 'Slovenčina',
// th: 'ไทย', th: 'ไทย',
// tr: 'Türkçe', tr: 'Türkçe',
// uk: 'Українська', uk: 'Українська',
// vi: 'Tiếng Việt', vi: 'Tiếng Việt',
// 'zh-Hans': '中文 (简体)', 'zh-Hans': '中文 (简体)',
// zh: '中文 (繁體)', zh: '中文 (繁體)',
}; };
export default trads; export default trads;

15
packages/strapi-admin/ee/admin/containers/Roles/CreatePage/index.js
View File

@ -33,13 +33,10 @@ const CreatePage = () => {
const id = get(params, 'params.id', null); const id = get(params, 'params.id', null);
const { const {
isLoading: isLayoutLoading, isLoading: isLayoutLoading,
// TODO
// data: permissionsLayout // data: permissionsLayout
} = useFetchPermissionsLayout(); } = useFetchPermissionsLayout();
const { const { permissions: rolePermissions, isLoading: isRoleLoading } = useFetchRole(id);
// role, permissions: rolePermissions,
isLoading: isRoleLoading,
} = useFetchRole(id);
// console.log({ role, rolePermissions });
const headerActions = (handleSubmit, handleReset) => [ const headerActions = (handleSubmit, handleReset) => [
{ {
@ -83,7 +80,7 @@ const CreatePage = () => {
}) })
) )
.then(async res => { .then(async res => {
const permissionsToSend = permissionsRef.current.getPermissions(); const { permissionsToSend } = permissionsRef.current.getPermissions();
if (id) { if (id) {
emitEvent('didDuplicateRole'); emitEvent('didDuplicateRole');
@ -197,7 +194,11 @@ const CreatePage = () => {
</FormCard> </FormCard>
{!isLayoutLoading && !isRoleLoading && ( {!isLayoutLoading && !isRoleLoading && (
<Padded top bottom size="md"> <Padded top bottom size="md">
<Permissions isFormDisabled={false} ref={permissionsRef} /> <Permissions
isFormDisabled={false}
ref={permissionsRef}
permissions={rolePermissions}
/>
</Padded> </Padded>
)} )}
</ContainerFluid> </ContainerFluid>