Merged in bugfix/new_pr_undefined_on_diff (pull request #359)

show notification if diff is empty

scm-ui/ui-components/src/repos/Diff.tsx

@@ -1,11 +1,14 @@
 import React from "react";
 import DiffFile from "./DiffFile";
 import { DiffObjectProps, File } from "./DiffTypes";
+import Notification from "../Notification";
+import { WithTranslation, withTranslation } from "react-i18next";
 
-type Props = DiffObjectProps & {
+type Props = WithTranslation &
+  DiffObjectProps & {
     diff: File[];
     defaultCollapse?: boolean;
-};
+  };
 
 class Diff extends React.Component<Props> {
   static defaultProps: Partial<Props> = {
@@ -13,15 +16,17 @@ class Diff extends React.Component<Props> {
   };
 
   render() {
-    const { diff, ...fileProps } = this.props;
+    const { diff, t, ...fileProps } = this.props;
     return (
       <>
-        {diff.map((file, index) => (
+        {diff.length === 0 ? (
-          <DiffFile key={index} file={file} {...fileProps} {...this.props} />
+          <Notification type="info">{t("noDiffFound")}</Notification>
-        ))}
+        ) : (
+          diff.map((file, index) => <DiffFile key={index} file={file} {...fileProps} {...this.props} />)
+        )}
       </>
     );
   }
 }
 
-export default Diff;
+export default withTranslation("plugins")(Diff);

scm-ui/ui-components/src/repos/LoadingDiff.tsx

@@ -43,6 +43,7 @@ class LoadingDiff extends React.Component<Props, State> {
 
   fetchDiff = () => {
     const { url } = this.props;
+    this.setState({loading: true});
     apiClient
       .get(url)
       .then(response => response.text())

scm-webapp/src/main/resources/locales/de/plugins.json

@@ -202,5 +202,6 @@
     "CustomNamespaceStrategy":  "Benutzerdefiniert",
     "CurrentYearNamespaceStrategy":  "Aktuelles Jahr",
     "RepositoryTypeNamespaceStrategy": "Repository Typ"
-  }
+  },
+  "noDiffFound": "Kein Diff zwischen den ausgewählten Branches gefunden."
 }

scm-webapp/src/main/resources/locales/en/plugins.json

@@ -202,5 +202,6 @@
     "CustomNamespaceStrategy": "Custom",
     "CurrentYearNamespaceStrategy": "Current year",
     "RepositoryTypeNamespaceStrategy": "Repository type"
-  }
+  },
+  "noDiffFound": "No Diff between the selected branches found."
 }

scm-webapp/src/main/resources/locales/es/plugins.json

@@ -182,5 +182,6 @@
     "CustomNamespaceStrategy":  "Personalizar",
     "CurrentYearNamespaceStrategy":  "Año actual",
     "RepositoryTypeNamespaceStrategy": "Tipo de repositorio"
-  }
+  },
+  "noDiffFound": "No se encontraron diferencias entre las ramas seleccionadas."
 }