From c42028433ff1946a2fb51792a230b052d0a41273 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 29 Jan 2019 10:26:11 +0100
Subject: [PATCH] map nonFastForwardDisallowed field from GitConfig and added
 ui

---
 .../java/sonia/scm/api/v2/resources/GitConfigDto.java  |  2 ++
 .../scm-git-plugin/src/main/js/GitConfigurationForm.js | 10 +++++++++-
 .../src/main/resources/locales/en/plugins.json         |  2 ++
 .../resources/GitConfigDtoToGitConfigMapperTest.java   |  5 +++--
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigDto.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigDto.java
index 3d07a91741..08602e2af1 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigDto.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigDto.java
@@ -15,6 +15,8 @@ public class GitConfigDto extends HalRepresentation {
 
   private String gcExpression;
 
+  private boolean nonFastForwardDisallowed;
+
   @Override
   @SuppressWarnings("squid:S1185") // We want to have this method available in this package
   protected HalRepresentation add(Links links) {
diff --git a/scm-plugins/scm-git-plugin/src/main/js/GitConfigurationForm.js b/scm-plugins/scm-git-plugin/src/main/js/GitConfigurationForm.js
index be977c53f3..363779c92b 100644
--- a/scm-plugins/scm-git-plugin/src/main/js/GitConfigurationForm.js
+++ b/scm-plugins/scm-git-plugin/src/main/js/GitConfigurationForm.js
@@ -8,6 +8,7 @@ import { InputField, Checkbox } from "@scm-manager/ui-components";
 type Configuration = {
   repositoryDirectory?: string,
   gcExpression?: string,
+  nonFastForwardDisallowed: boolean,
   disabled: boolean,
   _links: Links
 }
@@ -41,7 +42,7 @@ class GitConfigurationForm extends React.Component<Props, State> {
   };
 
   render() {
-    const { gcExpression, disabled } = this.state;
+    const { gcExpression, nonFastForwardDisallowed, disabled } = this.state;
     const { readOnly, t } = this.props;
 
     return (
@@ -53,6 +54,13 @@ class GitConfigurationForm extends React.Component<Props, State> {
                     onChange={this.handleChange}
                     disabled={readOnly}
         />
+        <Checkbox name="nonFastForwardDisallowed"
+                  label={t("scm-git-plugin.config.nonFastForwardDisallowed")}
+                  helpText={t("scm-git-plugin.config.nonFastForwardDisallowedHelpText")}
+                  checked={nonFastForwardDisallowed}
+                  onChange={this.handleChange}
+                  disabled={readOnly}
+        />
         <Checkbox name="disabled"
                   label={t("scm-git-plugin.config.disabled")}
                   helpText={t("scm-git-plugin.config.disabledHelpText")}
diff --git a/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json b/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json
index 68194e3a43..2b579801dd 100644
--- a/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json
+++ b/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json
@@ -19,6 +19,8 @@
       "title": "Git Configuration",
       "gcExpression": "GC Cron Expression",
       "gcExpressionHelpText": "Use Quartz Cron Expressions (SECOND MINUTE HOUR DAYOFMONTH MONTH DAYOFWEEK) to run git gc in intervals.",
+      "nonFastForwardDisallowed": "Disallow Non Fast-Forward",
+      "nonFastForwardDisallowedHelpText": "Reject git pushes which are non fast-forward such as --force.",
       "disabled": "Disabled",
       "disabledHelpText": "Enable or disable the Git plugin",
       "submit": "Submit"
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigDtoToGitConfigMapperTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigDtoToGitConfigMapperTest.java
index 0781b269d3..ed34db3008 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigDtoToGitConfigMapperTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigDtoToGitConfigMapperTest.java
@@ -6,8 +6,7 @@ import org.mockito.InjectMocks;
 import org.mockito.runners.MockitoJUnitRunner;
 import sonia.scm.repository.GitConfig;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.*;
 
 @RunWith(MockitoJUnitRunner.class)
 public class GitConfigDtoToGitConfigMapperTest {
@@ -21,12 +20,14 @@ public class GitConfigDtoToGitConfigMapperTest {
     GitConfig config = mapper.map(dto);
     assertEquals("express", config.getGcExpression());
     assertFalse(config.isDisabled());
+    assertTrue(config.isNonFastForwardDisallowed());
   }
 
   private GitConfigDto createDefaultDto() {
     GitConfigDto gitConfigDto = new GitConfigDto();
     gitConfigDto.setGcExpression("express");
     gitConfigDto.setDisabled(false);
+    gitConfigDto.setNonFastForwardDisallowed(true);
     return gitConfigDto;
   }
 }