@configuratorware/configurator-admingui 1.27.3-beta.8 → 1.27.6

package/src/Components/Menu.js

@@ -95,15 +95,7 @@ class Menu extends Component {
     };
 
     render() {
-        const {
-            classes,
-            open,
-            data,
-            showLicenseError,
-            version,
-            latestReleasedVersion,
-            showVersionUpdateBadge,
-        } = this.props;
+        const { classes, open, data, showLicenseError, version, latestReleasedVersion, showVersionUpdateBadge } = this.props;
         return (
             <Drawer
                 variant="persistent"

package/src/Components/Styles.scss

@@ -1,114 +1,114 @@
-.list-container {
-  position: relative;
-  padding-top: 45px;
-}
-
-.intl-input {
-  position: relative;
-
-  .intl-input-toggle {
-    position: absolute !important;
-    top: 0;
-    right: 0;
-    z-index: 1;
-  }
-}
-
-.highlighted-area {
-  background: rgba(33, 150, 243, 0.05);
-  box-shadow: 0px 0px 8px 4px rgba(33, 150, 243, 0.05);
-  transition: all .5s;
-}
-
-.sortlistThumb {
-  display: block;
-  margin: 10px auto;
-}
-
-.column-filter {
-  position: relative;
-
-  /*.toggle-filter {
-    position: absolute;
-    top: -18px;
-    right: 0;
-  }*/
-
-  /*> span {
-    line-height: 54px;
-    display: inline-block;
-  }*/
-
-  /*.filter-field {
-    max-width: 130px;
-    width: 100%;
-    float: left;
-  }*/
-}
-
-.form {
-  text-align: center;
-  margin-top: 40px;
-
-
-  .form-inner {
-    margin: auto;
-    text-align: left;
-    display: inline-block;
-    width: 100%;
-    max-width: 600px;
-  }
-
-  .form-input-wrapper {
-    display: block;
-    text-align: left;
-    clear: both;
-    padding-bottom: 14px;
-    position: relative;
-
-    .form-input-addButton {
-      position: absolute !important;
-      bottom: 20px;
-      right: 0;
-    }
-
-    &.withError {
-      .form-input-addButton {
-        bottom: 46px;
-      }
-    }
-  }
-}
-
-td, th {
-  &.id {
-    width: 20%;
-  }
-}
-
-.orderList-dialogBody {
-  height: 100vh;
-}
-
-.orderList {
-  overflow-y: auto;
-  height: 100%;
-  user-select: none;
-
-  > div {
-    padding: 5px;
-    &:hover {
-      cursor: move;
-    }
-  }
-}
-
-.orderList-helper {
-  z-index: 99999;
-  padding: 5px;
-  background-color: rgba(0, 0, 0, 0.1);
-}
-
-.orderList-button {
-  margin-top: 15px;
+.list-container {
+  position: relative;
+  padding-top: 45px;
+}
+
+.intl-input {
+  position: relative;
+
+  .intl-input-toggle {
+    position: absolute !important;
+    top: 0;
+    right: 0;
+    z-index: 1;
+  }
+}
+
+.highlighted-area {
+  background: rgba(33, 150, 243, 0.05);
+  box-shadow: 0px 0px 8px 4px rgba(33, 150, 243, 0.05);
+  transition: all .5s;
+}
+
+.sortlistThumb {
+  display: block;
+  margin: 10px auto;
+}
+
+.column-filter {
+  position: relative;
+
+  /*.toggle-filter {
+    position: absolute;
+    top: -18px;
+    right: 0;
+  }*/
+
+  /*> span {
+    line-height: 54px;
+    display: inline-block;
+  }*/
+
+  /*.filter-field {
+    max-width: 130px;
+    width: 100%;
+    float: left;
+  }*/
+}
+
+.form {
+  text-align: center;
+  margin-top: 40px;
+
+
+  .form-inner {
+    margin: auto;
+    text-align: left;
+    display: inline-block;
+    width: 100%;
+    max-width: 600px;
+  }
+
+  .form-input-wrapper {
+    display: block;
+    text-align: left;
+    clear: both;
+    padding-bottom: 14px;
+    position: relative;
+
+    .form-input-addButton {
+      position: absolute !important;
+      bottom: 20px;
+      right: 0;
+    }
+
+    &.withError {
+      .form-input-addButton {
+        bottom: 46px;
+      }
+    }
+  }
+}
+
+td, th {
+  &.id {
+    width: 20%;
+  }
+}
+
+.orderList-dialogBody {
+  height: 100vh;
+}
+
+.orderList {
+  overflow-y: auto;
+  height: 100%;
+  user-select: none;
+
+  > div {
+    padding: 5px;
+    &:hover {
+      cursor: move;
+    }
+  }
+}
+
+.orderList-helper {
+  z-index: 99999;
+  padding: 5px;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+.orderList-button {
+  margin-top: 15px;
 }

package/src/Components/Translations.js

@@ -28,8 +28,7 @@ require('../App/i18n').use(
             list: {
                 columnVisibilityInfo: 'hide/show columns',
                 deleteEntriesInfo: 'delete selected entries',
-                deleteEntriesHint:
-                    'Use the checkboxes to select one or more entries in the list<br>and then click this icon to delete them.',
+                deleteEntriesHint: 'Use the checkboxes to select one or more entries in the list<br>and then click this icon to delete them.',
             },
             detailView: {
                 close: 'Close Editor',
@@ -98,8 +97,7 @@ require('../App/i18n').use(
             list: {
                 columnVisibilityInfo: 'Spalten ein- oder ausblenden',
                 deleteEntriesInfo: 'Gewählte Einträge löschen',
-                deleteEntriesHint:
-                    'Nutze die Checkboxen in der Liste und klicke dann dieses Icon,<br>um einen oder mehrere Einträge zu löschen.',
+                deleteEntriesHint: 'Nutze die Checkboxen in der Liste und klicke dann dieses Icon,<br>um einen oder mehrere Einträge zu löschen.',
             },
             detailView: {
                 close: 'Editor schließen',

package/src/Screens/Assemblypointeditor/Components/Styles.scss

@@ -1,58 +1,58 @@
-.assembly-editor-container {
-
-  &.move {
-    .upper-canvas {
-      cursor: move !important;
-    }
-  }
-
-  .tools {
-    position: absolute;
-    right: 1px;
-    padding: 0;
-    z-index: 100;
-    background: rgba(255,255,255,0.8);
-    width: 100px;
-    //text-align: right;
-    > div {
-      display: inline-block;
-      float: right;
-    }
-    .zoom-value {
-      line-height: 48px;
-    }
-  }
-
-}
-
-.assemblypoints {
-  tr {
-    &.active {
-      background: rgba(128,255,128,0.5);
-    }
-  }
-}
-
-
-.assembly-element {
-  height: 60px;
-
-  .assembly-element-select-label {
-    float: left;
-    display: inline-block;
-    margin-right: 10px;
-    padding-top: 14px;
-  }
-
-  .assembly-element-select {
-    display: inline-block;
-    font-weight: bold;
-  }
-
-  .assembly-element-single-identifier {
-    display: inline-block;
-    padding-top: 14px;
-    font-weight: bold;
-  }
-
-}
+.assembly-editor-container {
+
+  &.move {
+    .upper-canvas {
+      cursor: move !important;
+    }
+  }
+
+  .tools {
+    position: absolute;
+    right: 1px;
+    padding: 0;
+    z-index: 100;
+    background: rgba(255,255,255,0.8);
+    width: 100px;
+    //text-align: right;
+    > div {
+      display: inline-block;
+      float: right;
+    }
+    .zoom-value {
+      line-height: 48px;
+    }
+  }
+
+}
+
+.assemblypoints {
+  tr {
+    &.active {
+      background: rgba(128,255,128,0.5);
+    }
+  }
+}
+
+
+.assembly-element {
+  height: 60px;
+
+  .assembly-element-select-label {
+    float: left;
+    display: inline-block;
+    margin-right: 10px;
+    padding-top: 14px;
+  }
+
+  .assembly-element-select {
+    display: inline-block;
+    font-weight: bold;
+  }
+
+  .assembly-element-single-identifier {
+    display: inline-block;
+    padding-top: 14px;
+    font-weight: bold;
+  }
+
+}

package/src/Screens/Assemblypointeditor/Styles.scss

@@ -1,38 +1,38 @@
-.split-container.assembly-editor {
-  position: absolute;
-  width: calc(100% - 2.4em);
-  height: calc(100% - 2.4em - 115px);
-
-  .split-left {
-    width: 40%;
-    max-width: 500px;
-  }
-  .split-right {
-    @media screen and (max-width: 960px) {
-      width: 100%;
-      top: 50px;
-    }
-    width: 60%;
-    min-width: calc(100% - 500px);
-    top: 0;
-    bottom: 0;
-    right: 0;
-    position: absolute;
-  }
-  &:after {
-    content: '';
-    clear: both;
-    width: 100%;
-    display: block;
-  }
-}
-
-.assemblypoints {
-  table {
-    input, select {
-      display: inline-block;
-      width: 100%;
-      height: 21px;
-    }
-  }
+.split-container.assembly-editor {
+  position: absolute;
+  width: calc(100% - 2.4em);
+  height: calc(100% - 2.4em - 115px);
+
+  .split-left {
+    width: 40%;
+    max-width: 500px;
+  }
+  .split-right {
+    @media screen and (max-width: 960px) {
+      width: 100%;
+      top: 50px;
+    }
+    width: 60%;
+    min-width: calc(100% - 500px);
+    top: 0;
+    bottom: 0;
+    right: 0;
+    position: absolute;
+  }
+  &:after {
+    content: '';
+    clear: both;
+    width: 100%;
+    display: block;
+  }
+}
+
+.assemblypoints {
+  table {
+    input, select {
+      display: inline-block;
+      width: 100%;
+      height: 21px;
+    }
+  }
 }

package/src/Screens/Client/Containers/Edit.js

@@ -3,10 +3,6 @@ import SimpleNestedData from '../../../Components/FormFragments/SimpleNestedData
 import generateConnectedEdit from '../../../Components/DefaultConnectedForm';
 import TextFields from '../Components/TextFields';
 import ColorTextField from '../Components/ColorTextField';
-import { t } from '../../../App/i18n';
-import React from 'react';
-import { CallToActionField } from '../../../Components/CallToActionField';
-import { PdfMarkDownField } from '../Components/PdfMarkdownField';
 
 const formFields = [
     {
@@ -14,6 +10,11 @@ const formFields = [
         label: 'Identifier',
         type: 'text',
     },
+    {
+        name: 'email',
+        label: 'Email',
+        type: 'text',
+    },
     {
         name: 'users',
         label: 'Users',
@@ -45,7 +46,7 @@ const formFields = [
         type: SimpleNestedData,
         fields: [
             {
-                name: 'highlightColor',
+                name: "highlightColor",
                 type: ColorTextField,
             },
             {
@@ -65,20 +66,6 @@ const formFields = [
             },
         ],
     },
-    {
-        name: 'pdfHeaderText',
-        label: 'PDF Header',
-        htmlField: 'pdfHeaderHtml',
-        type: PdfMarkDownField,
-        helperText: t('headerInfo'),
-    },
-    {
-        name: 'pdfFooterText',
-        label: 'PDF Footer',
-        htmlField: 'pdfFooterHtml',
-        type: PdfMarkDownField,
-        helperText: t('footerInfo'),
-    },
     {
         name: 'contactName',
         label: 'Clientname / Shopname',
@@ -105,38 +92,9 @@ const formFields = [
         type: 'text',
     },
     {
-        name: 'toEmailAddresses',
-        label: 'E-Mail(s) receiver for request offer',
-        type: 'text',
-        helperText: t('emailHint'),
-    },
-    {
-        name: 'fromEmailAddress',
-        label: 'E-Mail sender for request offer',
-        type: 'text',
-    },
-    {
-        name: 'ccEmailAddresses',
-        label: 'CC E-Mail(s) receiver for request offer',
-        type: 'text',
-        helperText: t('emailHint'),
-    },
-    {
-        name: 'bccEmailAddresses',
-        label: 'BCC E-Mail(s) receiver for request offer',
+        name: 'contactEmail',
+        label: 'E-mail (contact)',
         type: 'text',
-        helperText: t('emailHint'),
-    },
-    {
-        type: CallToActionField,
-        fields: [
-            {
-                name: 'callToAction',
-                label: 'callToAction.callToAction',
-                type: 'select',
-            },
-        ],
-        dynamicDefaultLabel: false
     },
     {
         type: TextFields,

package/src/Screens/Client/Reducers/Reducer.js

@@ -25,21 +25,12 @@ const initialState = {
                     font: { value: '' },
                 },
             },
-            pdfHeaderText: { value: '' },
-            pdfHeaderHtml: { value: '' },
-            pdfFooterText: { value: '' },
-            pdfFooterHtml: { value: '' },
-            contactName: { value: '' },
-            contactStreet: { value: '' },
-            contactPostCode: { value: '' },
-            contactCity: { value: '' },
-            contactPhone: { value: '' },
-            contactEmail: { value: '' },
-            toEmailAddresses: { value: '' },
-            fromEmailAddress: { value: '' },
-            ccEmailAddresses: { value: '' },
-            bccEmailAddresses: { value: '' },
-            callToAction: '',
+            contactName: { value: '', constraints: { presence: true } },
+            contactStreet: { value: '', constraints: { presence: true } },
+            contactPostCode: { value: '', constraints: { presence: true } },
+            contactCity: { value: '', constraints: { presence: true } },
+            contactPhone: { value: '', constraints: { presence: true } },
+            contactEmail: { value: '', constraints: { presence: true } },
             channels: { value: [] },
             customCss: '',
         },

package/src/Screens/Client/Styles.scss

@@ -1,3 +0,0 @@
-.helper-text {
-  font-size: 12px
-}

package/src/Screens/Client/Translations.js

@@ -12,9 +12,6 @@ require('../../App/i18n').use(
                     addButtonLabel: 'Add user',
                 },
             },
-            headerInfo: 'Please check your changes in a generated pdf to make sure it looks as expected',
-            footerInfo: 'Please check your changes in a generated pdf to make sure it looks as expected',
-            emailHint: 'separate multiple addresses with a semicolon',
         },
         de: {
             clients: 'Klienten',
@@ -23,15 +20,11 @@ require('../../App/i18n').use(
             'Theme - Font': 'Theme - Font',
             termsAndConditionsLink: 'Terms and conditions link',
             'Clientname / Shopname': 'Bezeichner/ Shopname',
-            'E-mail (contact)': 'E-Mail (Kontakt)',
             'Street / no': 'Straße / Hausnummer',
             'Post code': 'PLZ',
             City: 'Stadt',
             Phone: 'Telefonnummer',
-            'E-Mail(s) receiver for request offer': 'E-Mail(s) für die Angebotsanfrage',
-            'E-Mail sender for request offer': 'Absender E-Mail für die Angebotsanfrage',
-            'CC E-Mail(s) receiver for request offer': 'CC E-Mail(s) für die Angebotsanfrage',
-            'BCC E-Mail(s) receiver for request offer': 'BCC E-Mail(s) für die Angebotsanfrage',
+            'E-mail (contact)': 'E-Mail (Kontakt)',
             'Client logo': 'Kunden Logo',
             Texts: 'Texte',
             themeColorError: 'Bitte gib einen hexadezimalen Farbwert ein (z.B. #0000ff)',
@@ -41,9 +34,6 @@ require('../../App/i18n').use(
                     addButtonLabel: 'Benutzer hinzufügen',
                 },
             },
-            headerInfo: 'Bitte überprüfe Deine Änderungen in einem generierten PDF',
-            footerInfo: 'Bitte überprüfe Deine Änderungen in einem generierten PDF',
-            emailHint: 'trenne mehrere Adressen mit einem Semikolon',
         },
     },
     true

package/src/Screens/Creator/Components/CheckData/CheckData.js

@@ -121,7 +121,7 @@ const styles = {
     },
 };
 
-const CheckData = withStyles(styles)(({ itemIdentifier, itemId, checkItemData, area, license, classes }) => {
+const CheckData = withStyles(styles)(({ itemIdentifier, checkItemData, area, license, classes }) => {
     const [data, setData] = useState(null);
     const [error, setError] = useState(null);
     const loadData = async () => {
@@ -206,7 +206,7 @@ const CheckData = withStyles(styles)(({ itemIdentifier, itemId, checkItemData, a
         <AsyncDialog
             buttonLabel={T('dataCheck.buttonLabel')}
             dialogTitle={T('dataCheck.dialogTitle')}
-            buttonDisabled={!itemId}
+            buttonDisabled={!itemIdentifier}
             asyncTask={loadData}
         >
             {data && renderResult(data)}

package/src/Screens/Creator/Components/ComponentEditor.js

@@ -90,12 +90,10 @@ export const ComponentEditor = ({ component, onChange, onClose }) => {
         (loading ? (
             <CircularProgress size={24} />
         ) : (
-            <div
-                style={{
-                    display: 'flex',
-                    flexDirection: 'column',
-                }}
-            >
+            <div style={{
+                display: 'flex',
+                flexDirection: 'column',
+            }}>
                 {T('componentEditor.dialogInfo')}
 
                 <SelectField
@@ -111,9 +109,7 @@ export const ComponentEditor = ({ component, onChange, onClose }) => {
                         fontSize: '1.2 em',
                     }}
                 >
-                    <MenuItem value={'default'}>
-                        {T('componentEditor.fields.linkedViewDefaultLabel')}
-                    </MenuItem>
+                    <MenuItem value={'default'}>{T('componentEditor.fields.linkedViewDefaultLabel')}</MenuItem>
                     {creatorViewList &&
                         creatorViewList.map(option => (
                             <MenuItem value={option.id} key={option.id}>