Add missing subtitles (#1496)

Add the last missing subtitles in the scmm core.

scm-ui/ui-webapp/public/locales/de/commons.json

@@ -86,6 +86,7 @@
     "error-message": "'me' ist nicht definiert"
   },
   "password": {
+    "subtitle": "Passwort ändern",
     "label": "Passwort",
     "newPassword": "Neues Passwort",
     "currentPassword": "Aktuelles Passwort",

scm-ui/ui-webapp/public/locales/de/permissions.json

@@ -1,6 +1,7 @@
 {
   "setPermissions": {
-    "button": "Berechtigungen speichern",
+    "subtitle": "Berechtigungen setzen",
+    "button": "Berechtigungen setzen",
     "setPermissionsSuccessful": "Berechtigungen erfolgreich gespeichert"
   }
 }

scm-ui/ui-webapp/public/locales/de/users.json

@@ -61,6 +61,7 @@
     }
   },
   "singleUserPassword": {
+    "subtitle": "Passwort setzen",
     "button": "Passwort setzen",
     "setPasswordSuccessful": "Das Passwort wurde erfolgreich gespeichert."
   },

scm-ui/ui-webapp/public/locales/en/commons.json

@@ -87,6 +87,7 @@
     "error-message": "'me' is undefined"
   },
   "password": {
+    "subtitle": "Change Password",
     "label": "Password",
     "newPassword": "New Password",
     "currentPassword": "Current Password",

scm-ui/ui-webapp/public/locales/en/permissions.json

@@ -1,5 +1,6 @@
 {
   "setPermissions": {
+    "subtitle": "Set Permissions",
     "button": "Set Permissions",
     "setPermissionsSuccessful": "Permissions set successfully"
   }

scm-ui/ui-webapp/public/locales/en/users.json

@@ -61,6 +61,7 @@
     }
   },
   "singleUserPassword": {
+    "subtitle": "Set Password",
     "button": "Set Password",
     "setPasswordSuccessful": "Password successfully set"
   },

scm-ui/ui-webapp/src/containers/ChangeUserPassword.tsx

@@ -28,7 +28,8 @@ import {
   Level,
   Notification,
   PasswordConfirmation,
-  SubmitButton
+  SubmitButton,
+  Subtitle
 } from "@scm-manager/ui-components";
 import { WithTranslation, withTranslation } from "react-i18next";
 import { Me } from "@scm-manager/ui-types";
@@ -55,9 +56,6 @@ class ChangeUserPassword extends React.Component<Props, State> {
       oldPassword: "",
       password: "",
       loading: false,
-      passwordConfirmationError: false,
-      validatePasswordError: false,
-      validatePassword: "",
       passwordChanged: false,
       passwordValid: false
     };
@@ -127,6 +125,7 @@ class ChangeUserPassword extends React.Component<Props, State> {
 
     return (
       <form onSubmit={this.submit}>
+        <Subtitle subtitle={t("password.subtitle")} />
         {message}
         <div className="columns">
           <div className="column">

scm-ui/ui-webapp/src/permissions/components/SetPermissions.tsx

@@ -25,7 +25,7 @@ import React from "react";
 import { connect } from "react-redux";
 import { WithTranslation, withTranslation } from "react-i18next";
 import { Link } from "@scm-manager/ui-types";
-import { ErrorNotification, Level, Notification, SubmitButton } from "@scm-manager/ui-components";
+import { ErrorNotification, Level, Notification, SubmitButton, Subtitle } from "@scm-manager/ui-components";
 import { getLink } from "../../modules/indexResource";
 import { loadPermissionsForEntity, setPermissions } from "./handlePermissions";
 import PermissionsWrapper from "./PermissionsWrapper";
@@ -134,6 +134,7 @@ class SetPermissions extends React.Component<Props, State> {
 
     return (
       <form onSubmit={this.submit}>
+        <Subtitle subtitle={t("setPermissions.subtitle")} />
         {message}
         {this.renderPermissions()}
         <Level

scm-ui/ui-webapp/src/users/components/SetUserPassword.tsx

@@ -24,7 +24,14 @@
 import React from "react";
 import { WithTranslation, withTranslation } from "react-i18next";
 import { User } from "@scm-manager/ui-types";
-import { ErrorNotification, Level, Notification, PasswordConfirmation, SubmitButton } from "@scm-manager/ui-components";
+import {
+  ErrorNotification,
+  Subtitle,
+  Level,
+  Notification,
+  PasswordConfirmation,
+  SubmitButton
+} from "@scm-manager/ui-components";
 import { setPassword } from "./setPassword";
 
 type Props = WithTranslation & {
@@ -46,9 +53,6 @@ class SetUserPassword extends React.Component<Props, State> {
     this.state = {
       password: "",
       loading: false,
-      passwordConfirmationError: false,
-      validatePasswordError: false,
-      validatePassword: "",
       passwordChanged: false,
       passwordValid: false
     };
@@ -85,14 +89,16 @@ class SetUserPassword extends React.Component<Props, State> {
       const { password } = this.state;
       this.setLoadingState();
       setPassword(user._links.password.href, password)
-        .then(result => {
+        .then((result) => {
           if (result.error) {
             this.setErrorState(result.error);
           } else {
             this.setSuccessfulState();
           }
         })
-        .catch(err => {});
+        .catch((err) => {
+          this.setErrorState(err);
+        });
     }
   };
 
@@ -116,6 +122,7 @@ class SetUserPassword extends React.Component<Props, State> {
 
     return (
       <form onSubmit={this.submit}>
+        <Subtitle subtitle={t("singleUserPassword.subtitle")} />
         {message}
         <PasswordConfirmation
           passwordChanged={this.passwordChanged}