Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add delete flag in configuration #707

Merged
merged 4 commits into from
Oct 30, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions example/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ collections: # A list of collections the CMS should be able to edit

- name: "settings"
label: "Settings"
delete: false # Prevent users from deleting documents in this collection
editor:
preview: false
files:
Expand Down
7 changes: 6 additions & 1 deletion src/backends/backend.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import TestRepoBackend from "./test-repo/implementation";
import GitHubBackend from "./github/implementation";
import GitGatewayBackend from "./git-gateway/implementation";
import { resolveFormat } from "../formats/formats";
import { selectListMethod, selectEntrySlug, selectEntryPath, selectAllowNewEntries, selectFolderEntryExtension } from "../reducers/collections";
import { selectListMethod, selectEntrySlug, selectEntryPath, selectAllowNewEntries, selectAllowDeletion, selectFolderEntryExtension } from "../reducers/collections";
import { createEntry } from "../valueObjects/Entry";
import { sanitizeSlug } from "../lib/urlHelper";

Expand Down Expand Up @@ -246,6 +246,11 @@ class Backend {

deleteEntry(config, collection, slug) {
const path = selectEntryPath(collection, slug);

if (!selectAllowDeletion(collection)) {
throw (new Error("Not allowed to delete entries in this collection"));
}

const commitMessage = `Delete ${ collection.get('label') } “${ slug }”`;
return this.implementation.deleteFile(path, commitMessage);
}
Expand Down
8 changes: 6 additions & 2 deletions src/containers/editorialWorkflow/EntryPageHOC.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react';
import { connect } from 'react-redux';
import { EDITORIAL_WORKFLOW } from '../../constants/publishModes';
import { selectUnpublishedEntry, selectEntry } from '../../reducers';
import { selectAllowDeletion } from "../../reducers/collections";
import { loadUnpublishedEntry, persistUnpublishedEntry } from '../../actions/editorialWorkflow';


Expand All @@ -15,11 +16,14 @@ export default function EntryPageHOC(EntryPage) {
function mapStateToProps(state, ownProps) {
const { collections } = state;
const isEditorialWorkflow = (state.config.get('publish_mode') === EDITORIAL_WORKFLOW);
const returnObj = { isEditorialWorkflow, showDelete: !ownProps.newEntry };
const collection = collections.get(ownProps.match.params.name);
const returnObj = {
isEditorialWorkflow,
showDelete: !ownProps.newEntry && selectAllowDeletion(collection),
};
if (isEditorialWorkflow) {
returnObj.showDelete = false;
const slug = ownProps.match.params.slug;
const collection = collections.get(ownProps.match.params.name);
const unpublishedEntry = selectUnpublishedEntry(state, collection.get('name'), slug);
if (unpublishedEntry) {
returnObj.unpublishedEntry = true;
Expand Down
7 changes: 7 additions & 0 deletions src/reducers/collections.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ const selectors = {
allowNewEntries(collection) {
return collection.get('create');
},
allowDeletion(collection) {
return collection.get('delete', true);
},
templateName(collection) {
return collection.get('name');
},
Expand Down Expand Up @@ -80,6 +83,9 @@ const selectors = {
allowNewEntries() {
return false;
},
allowDeletion(collection) {
return collection.get('delete', true);
},
templateName(collection, slug) {
return slug;
},
Expand All @@ -92,6 +98,7 @@ export const selectEntryPath = (collection, slug) => selectors[collection.get('t
export const selectEntrySlug = (collection, path) => selectors[collection.get('type')].entrySlug(collection, path);
export const selectListMethod = collection => selectors[collection.get('type')].listMethod();
export const selectAllowNewEntries = collection => selectors[collection.get('type')].allowNewEntries(collection);
export const selectAllowDeletion = collection => selectors[collection.get('type')].allowDeletion(collection);
export const selectTemplateName = (collection, slug) => selectors[collection.get('type')].templateName(collection, slug);
export const selectInferedField = (collection, fieldName) => {
const inferableField = INFERABLE_FIELDS[fieldName];
Expand Down