Skip to content

Commit

Permalink
Merge pull request #44 from plone/control-panels
Browse files Browse the repository at this point in the history
Control panels
  • Loading branch information
robgietema committed Sep 23, 2017
2 parents 4815e2f + f0718d1 commit b2658ad
Show file tree
Hide file tree
Showing 37 changed files with 1,315 additions and 181 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,10 @@
# Change Log

## 0.5.0 (unreleased)
### Added
- Added pastanaga theme package @jaroel, @robgietema
- Added registry based controlpanels @robgietema

## 0.4.0 (2017-05-03)
### Added
- Adding tiles @robgietema
Expand Down
15 changes: 13 additions & 2 deletions locales/de/LC_MESSAGES/plone-react.po
Expand Up @@ -68,7 +68,6 @@ msgstr "Standardmäßig werden die Berechtigungen von einem Ordner auf die in ih

#: components/manage/Contents/ContentsUploadModal
#: components/manage/Delete/Delete
#: components/manage/Form/Form
#: components/manage/Form/ModalForm
#: components/manage/Sharing/Sharing
msgid "Cancel"
Expand All @@ -93,10 +92,18 @@ msgstr "Statusänderung"
msgid "Changes saved"
msgstr "Änderungen gespeichert"

#: components/manage/Controlpanels/Controlpanel
msgid "Changes saved."
msgstr ""

#: components/manage/Diff/Diff
msgid "Compare"
msgstr "Vergleichen"

#: components/manage/Controlpanels/Controlpanels
msgid "Configuration area for Plone and add-on Products."
msgstr ""

#: components/manage/Preferences/ChangePassword
msgid "Confirm password"
msgstr "Passwort bestätigen"
Expand Down Expand Up @@ -446,7 +453,6 @@ msgstr "Durch diese Version ersetzen"
msgid "Rights"
msgstr "Rechte"

#: components/manage/Form/Form
#: components/manage/Form/ModalForm
#: components/manage/Sharing/Sharing
msgid "Save"
Expand Down Expand Up @@ -505,6 +511,11 @@ msgstr "Website-Administrator"
msgid "Site Map"
msgstr "Übersicht"

#: components/manage/Controlpanels/Controlpanels
#: components/manage/Toolbar/Toolbar
msgid "Site Setup"
msgstr ""

#: components/manage/Contents/Contents
#: components/theme/View/TabularView
msgid "State"
Expand Down
15 changes: 13 additions & 2 deletions locales/en/LC_MESSAGES/plone-react.po
Expand Up @@ -53,7 +53,6 @@ msgstr ""

#: components/manage/Contents/ContentsUploadModal
#: components/manage/Delete/Delete
#: components/manage/Form/Form
#: components/manage/Form/ModalForm
#: components/manage/Sharing/Sharing
msgid "Cancel"
Expand All @@ -78,10 +77,18 @@ msgstr ""
msgid "Changes saved"
msgstr ""

#: components/manage/Controlpanels/Controlpanel
msgid "Changes saved."
msgstr ""

#: components/manage/Diff/Diff
msgid "Compare"
msgstr ""

#: components/manage/Controlpanels/Controlpanels
msgid "Configuration area for Plone and add-on Products."
msgstr ""

#: components/manage/Preferences/ChangePassword
msgid "Confirm password"
msgstr ""
Expand Down Expand Up @@ -431,7 +438,6 @@ msgstr ""
msgid "Rights"
msgstr ""

#: components/manage/Form/Form
#: components/manage/Form/ModalForm
#: components/manage/Sharing/Sharing
msgid "Save"
Expand Down Expand Up @@ -490,6 +496,11 @@ msgstr ""
msgid "Site Map"
msgstr ""

#: components/manage/Controlpanels/Controlpanels
#: components/manage/Toolbar/Toolbar
msgid "Site Setup"
msgstr ""

#: components/manage/Contents/Contents
#: components/theme/View/TabularView
msgid "State"
Expand Down
15 changes: 13 additions & 2 deletions locales/nl/LC_MESSAGES/plone-react.po
Expand Up @@ -72,7 +72,6 @@ msgstr "Standaard worden de rechten overgenomen van de bovenliggende map. Als u

#: components/manage/Contents/ContentsUploadModal
#: components/manage/Delete/Delete
#: components/manage/Form/Form
#: components/manage/Form/ModalForm
#: components/manage/Sharing/Sharing
msgid "Cancel"
Expand All @@ -97,10 +96,18 @@ msgstr "Status wijzigen"
msgid "Changes saved"
msgstr "Wijzigingen zijn opgeslagen"

#: components/manage/Controlpanels/Controlpanel
msgid "Changes saved."
msgstr ""

#: components/manage/Diff/Diff
msgid "Compare"
msgstr "Vergelijken"

#: components/manage/Controlpanels/Controlpanels
msgid "Configuration area for Plone and add-on Products."
msgstr ""

#: components/manage/Preferences/ChangePassword
msgid "Confirm password"
msgstr "Wachtwoord bevestigen"
Expand Down Expand Up @@ -450,7 +457,6 @@ msgstr "Deze rivisie herstellen"
msgid "Rights"
msgstr "Rechten"

#: components/manage/Form/Form
#: components/manage/Form/ModalForm
#: components/manage/Sharing/Sharing
msgid "Save"
Expand Down Expand Up @@ -509,6 +515,11 @@ msgstr "Sitebeheerder"
msgid "Site Map"
msgstr "Sitemap"

#: components/manage/Controlpanels/Controlpanels
#: components/manage/Toolbar/Toolbar
msgid "Site Setup"
msgstr ""

#: components/manage/Contents/Contents
#: components/theme/View/TabularView
msgid "State"
Expand Down
20 changes: 17 additions & 3 deletions locales/plone-react.pot
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Plone\n"
"POT-Creation-Date: 2017-04-30T16:20:43.407Z\n"
"POT-Creation-Date: 2017-09-23T14:11:57.276Z\n"
"Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
"Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -65,7 +65,6 @@ msgstr ""

#: components/manage/Contents/ContentsUploadModal
#: components/manage/Delete/Delete
#: components/manage/Form/Form
#: components/manage/Form/ModalForm
#: components/manage/Sharing/Sharing
# defaultMessage: Cancel
Expand Down Expand Up @@ -95,11 +94,21 @@ msgstr ""
msgid "Changes saved"
msgstr ""

#: components/manage/Controlpanels/Controlpanel
# defaultMessage: Changes saved.
msgid "Changes saved."
msgstr ""

#: components/manage/Diff/Diff
# defaultMessage: Compare
msgid "Compare"
msgstr ""

#: components/manage/Controlpanels/Controlpanels
# defaultMessage: Configuration area for Plone and add-on Products.
msgid "Configuration area for Plone and add-on Products."
msgstr ""

#: components/manage/Preferences/ChangePassword
# defaultMessage: Confirm password
msgid "Confirm password"
Expand Down Expand Up @@ -529,7 +538,6 @@ msgstr ""
msgid "Rights"
msgstr ""

#: components/manage/Form/Form
#: components/manage/Form/ModalForm
#: components/manage/Sharing/Sharing
# defaultMessage: Save
Expand Down Expand Up @@ -602,6 +610,12 @@ msgstr ""
msgid "Site Map"
msgstr ""

#: components/manage/Controlpanels/Controlpanels
#: components/manage/Toolbar/Toolbar
# defaultMessage: Site Setup
msgid "Site Setup"
msgstr ""

#: components/manage/Contents/Contents
#: components/theme/View/TabularView
# defaultMessage: State
Expand Down
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -133,7 +133,7 @@
"babel-preset-stage-0": "6.24.1",
"babel-register": "6.26.0",
"babel-runtime": "6.26.0",
"body-parser": "1.18.1",
"body-parser": "1.18.2",
"client-sessions": "0.8.0",
"compression": "1.7.0",
"copy-webpack-plugin": "4.0.1",
Expand Down Expand Up @@ -226,7 +226,7 @@
"concurrently": "3.5.0",
"css-loader": "0.28.7",
"dirty-chai": "2.0.1",
"eslint": "4.7.1",
"eslint": "4.7.2",
"eslint-config-airbnb": "15.1.0",
"eslint-loader": "1.9.0",
"eslint-plugin-import": "2.7.0",
Expand Down
36 changes: 36 additions & 0 deletions src/actions/controlpanel/controlpanel.js
@@ -0,0 +1,36 @@
/**
* Controlpanel actions.
* @module actions/controlpanel/controlpanel
*/

import {
EDIT_CONTROLPANEL,
GET_CONTROLPANEL,
} from '../../constants/ActionTypes';

/**
* Get controlpanel function.
* @function getControlpanel
* @param {id} id Controlpanel id.
* @returns {Object} Get controlpanel action.
*/
export function getControlpanel(id) {
return {
type: GET_CONTROLPANEL,
promise: api => api.get(`/@controlpanels/${id}`),
};
}

/**
* Edit controlpanel function.
* @function editControlpanel
* @param {string} url Controlpanel url.
* @param {Object} data Controlpanel data.
* @returns {Object} Edit controlpanel action.
*/
export function editControlpanel(url, data) {
return {
type: EDIT_CONTROLPANEL,
promise: api => api.patch(url, { data }),
};
}
40 changes: 40 additions & 0 deletions src/actions/controlpanel/controlpanel.test.js
@@ -0,0 +1,40 @@
import { editControlpanel, getControlpanel } from './controlpanel';
import {
EDIT_CONTROLPANEL,
GET_CONTROLPANEL,
} from '../../constants/ActionTypes';

describe('Controlpanel action', () => {
describe('getControlpanel', () => {
it('should create an action to get the controlpanel', () => {
const url = 'my-url';
const action = getControlpanel(url);

expect(action.type).toEqual(GET_CONTROLPANEL);

const apiMock = {
get: jest.fn(),
};
action.promise(apiMock);

expect(apiMock.get).toBeCalledWith(`/@controlpanels/${url}`);
});
});

describe('editControlpanel', () => {
it('should create an action to edit a controlpanel', () => {
const url = 'http://localhost';
const data = 'Hello World!';
const action = editControlpanel(url, data);

expect(action.type).toEqual(EDIT_CONTROLPANEL);

const apiMock = {
patch: jest.fn(),
};
action.promise(apiMock);

expect(apiMock.patch).toBeCalledWith(url, { data });
});
});
});
18 changes: 18 additions & 0 deletions src/actions/controlpanels/controlpanels.js
@@ -0,0 +1,18 @@
/**
* Controlpanels actions.
* @module actions/controlpanels/controlpanels
*/

import { GET_CONTROLPANELS } from '../../constants/ActionTypes';

/**
* Get controlpanels function.
* @function getControlpanels
* @returns {Object} Get controlpanels action.
*/
export default function getControlpanels() {
return {
type: GET_CONTROLPANELS,
promise: api => api.get('/@controlpanels'),
};
}
19 changes: 19 additions & 0 deletions src/actions/controlpanels/controlpanels.test.js
@@ -0,0 +1,19 @@
import getControlpanels from './controlpanels';
import { GET_CONTROLPANELS } from '../../constants/ActionTypes';

describe('Controlpanels action', () => {
describe('getControlpanels', () => {
it('should create an action to get the controlpanels', () => {
const action = getControlpanels();

expect(action.type).toEqual(GET_CONTROLPANELS);

const apiMock = {
get: jest.fn(),
};
action.promise(apiMock);

expect(apiMock.get).toBeCalledWith('/@controlpanels');
});
});
});
2 changes: 2 additions & 0 deletions src/actions/index.js
Expand Up @@ -14,6 +14,8 @@ export {
orderContent,
sortContent,
} from './content/content';
export { editControlpanel, getControlpanel } from './controlpanel/controlpanel';
export getControlpanels from './controlpanels/controlpanels';
export getDiff from './diff/diff';
export { getHistory, revertHistory } from './history/history';
export { addMessage, removeMessage } from './messages/messages';
Expand Down
2 changes: 2 additions & 0 deletions src/components/index.js
Expand Up @@ -42,6 +42,8 @@ export ContentsPropertiesModal from './manage/Contents/ContentsPropertiesModal';
export ContentsRenameModal from './manage/Contents/ContentsRenameModal';
export ContentsWorkflowModal from './manage/Contents/ContentsWorkflowModal';
export ContentsTagsModal from './manage/Contents/ContentsTagsModal';
export Controlpanel from './manage/Controlpanels/Controlpanel';
export Controlpanels from './manage/Controlpanels/Controlpanels';
export Delete from './manage/Delete/Delete';
export Diff from './manage/Diff/Diff';
export DiffField from './manage/Diff/DiffField';
Expand Down

0 comments on commit b2658ad

Please sign in to comment.