Web: Refactoring, deleted useless code.

web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/consumer-storage-settings/AmazonSettings.js

@@ -21,20 +21,17 @@ class AmazonSettings extends React.Component {
 
   constructor(props) {
     super(props);
-    const { t, availableStorage, selectedId } = this.props;
+    const { t, selectedStorage } = this.props;
 
-    this.isDisabled =
-      availableStorage[selectedId] && !availableStorage[selectedId].isSet;
+    this.isDisabled = selectedStorage && !selectedStorage.isSet;
 
     this.bucketPlaceholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[0].title;
+      selectedStorage && selectedStorage.properties[0].title;
 
     this.forcePathStylePlaceholder = t("ForcePathStyle");
 
     this.regionPlaceholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[2].title;
+      selectedStorage && selectedStorage.properties[2].title;
 
     this.serviceUrlPlaceholder = t("ServiceUrl");
     this.SSEPlaceholder = t("SSE");

web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/consumer-storage-settings/GoogleCloudSettings.js

@@ -4,14 +4,12 @@ import TextInput from "@appserver/components/text-input";
 class GoogleCloudSettings extends React.Component {
   constructor(props) {
     super(props);
-    const { availableStorage, selectedId } = this.props;
+    const { selectedStorage } = this.props;
 
-    this.isDisabled =
-      availableStorage[selectedId] && !availableStorage[selectedId].isSet;
+    this.isDisabled = selectedStorage && !selectedStorage.isSet;
 
     this.bucketPlaceholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[0].title;
+      selectedStorage && selectedStorage.properties[0].title;
   }
 
   render() {

web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/consumer-storage-settings/RackspaceSettings.js

@@ -11,22 +11,18 @@ class RackspaceSettings extends React.Component {
 
   constructor(props) {
     super(props);
-    const { availableStorage, selectedId } = this.props;
+    const { selectedStorage } = this.props;
 
-    this.isDisabled =
-      availableStorage[selectedId] && !availableStorage[selectedId].isSet;
+    this.isDisabled = selectedStorage && !selectedStorage.isSet;
 
     this.privatePlaceholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[0].title;
+      selectedStorage && selectedStorage.properties[0].title;
 
     this.publicPlaceholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[1].title;
+      selectedStorage && selectedStorage.properties[1].title;
 
     this.regionPlaceholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[2].title;
+      selectedStorage && selectedStorage.properties[2].title;
   }
 
   render() {

web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/consumer-storage-settings/SelectelSettings.js

@@ -10,18 +10,15 @@ class SelectelSettings extends React.Component {
 
   constructor(props) {
     super(props);
-    const { availableStorage, selectedId } = this.props;
+    const { selectedStorage } = this.props;
 
-    this.isDisabled =
-      availableStorage[selectedId] && !availableStorage[selectedId].isSet;
+    this.isDisabled = selectedStorage && !selectedStorage.isSet;
 
     this.privatePlaceholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[0].title;
+      selectedStorage && selectedStorage.properties[0].title;
 
     this.publicPlaceholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[1].title;
+      selectedStorage && selectedStorage.properties[1].title;
   }
 
   render() {

web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/sub-components-automatic-backup/amazonStorage.js

@@ -50,21 +50,6 @@ class AmazonStorage extends React.Component {
     this.isDisabled =
       availableStorage[selectedId] && !availableStorage[selectedId].isSet;
 
-    this.defaultBucketPlaceholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[0].title;
-
-    this.defaultForcePathStylePlaceholder = t("ForcePathStyle");
-
-    this.defaultRegionPlaceholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[2].title;
-
-    this.defaultServiceUrlPlaceholder = t("ServiceUrl");
-
-    this.defaultSSEPlaceholder = t("SSE");
-
-    this.defaultUseHttpPlaceholder = t("UseHttp");
     this._isMounted = false;
   }
 
@@ -181,8 +166,7 @@ class AmazonStorage extends React.Component {
           isLoading={isLoading}
           isLoadingData={isLoadingData}
           isError={formErrors}
-          availableStorage={availableStorage}
-          selectedId={selectedId}
+          selectedStorage={availableStorage[selectedId]}
           t={t}
         />
 

web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/sub-components-automatic-backup/googleCloudStorage.js

@@ -26,9 +26,6 @@ class GoogleCloudStorage extends React.Component {
     this.isDisabled =
       availableStorage[selectedId] && !availableStorage[selectedId].isSet;
 
-    this.placeholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[0].title;
     this._isMounted = false;
   }
 
@@ -93,7 +90,7 @@ class GoogleCloudStorage extends React.Component {
   };
 
   render() {
-    const { bucket, isChangedInput, formErrors, formSettings } = this.state;
+    const { isChangedInput, formErrors, formSettings } = this.state;
     const {
       t,
       isLoadingData,
@@ -111,8 +108,7 @@ class GoogleCloudStorage extends React.Component {
           onChange={this.onChange}
           isLoading={isLoading}
           isError={formErrors}
-          availableStorage={availableStorage}
-          selectedId={selectedId}
+          selectedStorage={availableStorage[selectedId]}
         />
 
         {(isChanged || isChangedInput) && (

web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/sub-components-automatic-backup/rackspaceStorage.js

@@ -35,18 +35,6 @@ class RackspaceStorage extends React.Component {
     this.isDisabled =
       availableStorage[selectedId] && !availableStorage[selectedId].isSet;
 
-    this.privatePlaceholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[0].title;
-
-    this.publicPlaceholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[1].title;
-
-    this.regionPlaceholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[2].title;
-
     this._isMounted = false;
   }
 
@@ -138,8 +126,7 @@ class RackspaceStorage extends React.Component {
           isLoading={isLoading}
           isLoadingData={isLoadingData}
           isError={formErrors}
-          availableStorage={availableStorage}
-          selectedId={selectedId}
+          selectedStorage={availableStorage[selectedId]}
           t={t}
         />
 

web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/sub-components-automatic-backup/selectelStorage.js

@@ -29,14 +29,6 @@ class SelectelStorage extends React.Component {
     this.isDisabled =
       availableStorage[selectedId] && !availableStorage[selectedId].isSet;
 
-    this.privatePlaceholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[0].title;
-
-    this.publicPlaceholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[1].title;
-
     this._isMounted = false;
   }
 
@@ -126,8 +118,7 @@ class SelectelStorage extends React.Component {
           isLoading={isLoading}
           isLoadingData={isLoadingData}
           isError={formErrors}
-          availableStorage={availableStorage}
-          selectedId={selectedId}
+          selectedStorage={availableStorage[selectedId]}
           t={t}
         />
 

web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/sub-components-manual-backup/storages/AmazonStorage.js

@@ -24,21 +24,6 @@ class AmazonStorage extends React.Component {
     this.isDisabled =
       availableStorage[selectedId] && !availableStorage[selectedId].isSet;
 
-    this.defaultBucketPlaceholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[0].title;
-
-    this.defaultForcePathStylePlaceholder = t("ForcePathStyle");
-
-    this.defaultRegionPlaceholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[2].title;
-
-    this.defaultServiceUrlPlaceholder = t("ServiceUrl");
-
-    this.defaultSSEPlaceholder = t("SSE");
-
-    this.defaultUseHttpPlaceholder = t("UseHttp");
     this._isMounted = false;
   }
 
@@ -91,8 +76,7 @@ class AmazonStorage extends React.Component {
           isLoading={isLoading}
           isLoadingData={isLoadingData}
           isError={formErrors}
-          availableStorage={availableStorage}
-          selectedId={selectedId}
+          selectedStorage={availableStorage[selectedId]}
           t={t}
         />
 

web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/sub-components-manual-backup/storages/GoogleCloudStorage.js

@@ -19,9 +19,6 @@ class GoogleCloudStorage extends React.Component {
     this.isDisabled =
       availableStorage[selectedId] && !availableStorage[selectedId].isSet;
 
-    this.placeholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[0].title;
     this._isMounted = false;
   }
 
@@ -72,8 +69,7 @@ class GoogleCloudStorage extends React.Component {
           onChange={this.onChange}
           isLoading={isLoading}
           isError={formErrors}
-          availableStorage={availableStorage}
-          selectedId={selectedId}
+          selectedStorage={availableStorage[selectedId]}
           isLoadingData={isLoadingData}
         />
 

web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/sub-components-manual-backup/storages/RackspaceStorage.js

@@ -21,18 +21,6 @@ class RackspaceStorage extends React.Component {
     this.isDisabled =
       availableStorage[selectedId] && !availableStorage[selectedId].isSet;
 
-    this.privatePlaceholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[0].title;
-
-    this.publicPlaceholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[1].title;
-
-    this.regionPlaceholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[2].title;
-
     this._isMounted = false;
   }
 
@@ -86,8 +74,7 @@ class RackspaceStorage extends React.Component {
           isLoading={isLoading}
           isLoadingData={isLoadingData}
           isError={formErrors}
-          availableStorage={availableStorage}
-          selectedId={selectedId}
+          selectedStorage={availableStorage[selectedId]}
           t={t}
         />
 

web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/sub-components-manual-backup/storages/SelectelStorage.js

@@ -20,14 +20,6 @@ class SelectelStorage extends React.Component {
 
     this.isDisabled =
       availableStorage[selectedId] && !availableStorage[selectedId].isSet;
-
-    this.privatePlaceholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[0].title;
-
-    this.publicPlaceholder =
-      availableStorage[selectedId] &&
-      availableStorage[selectedId].properties[1].title;
   }
 
   onChange = (event) => {
@@ -80,8 +72,7 @@ class SelectelStorage extends React.Component {
           isLoading={isLoading}
           isLoadingData={isLoadingData}
           isError={formErrors}
-          availableStorage={availableStorage}
-          selectedId={selectedId}
+          selectedStorage={availableStorage[selectedId]}
           t={t}
         />
 

web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/sub-components-restore-backup/storages/AmazonStorage.js

@@ -34,8 +34,7 @@ class AmazonStorage extends React.Component {
           onChange={onChange}
           isLoading={isLoading}
           isError={isErrors}
-          availableStorage={availableStorage}
-          selectedId={selectedId}
+          selectedStorage={availableStorage[selectedId]}
           t={t}
         />
 

web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/sub-components-restore-backup/storages/GoogleCloudStorage.js

@@ -33,8 +33,7 @@ class GoogleCloudStorage extends React.Component {
           onChange={onChange}
           isLoading={isLoading}
           isError={isErrors}
-          availableStorage={availableStorage}
-          selectedId={selectedId}
+          selectedStorage={availableStorage[selectedId]}
         />
         <TextInput
           name="path"

web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/sub-components-restore-backup/storages/RackspaceStorage.js

@@ -34,8 +34,7 @@ class RackspaceStorage extends React.Component {
           onChange={onChange}
           isLoading={isLoading}
           isError={isErrors}
-          availableStorage={availableStorage}
-          selectedId={selectedId}
+          selectedStorage={availableStorage[selectedId]}
         />
 
         <TextInput

web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/sub-components-restore-backup/storages/SelectelStorage.js

@@ -34,8 +34,7 @@ class RackspaceStorage extends React.Component {
           onChange={onChange}
           isLoading={isLoading}
           isError={isErrors}
-          availableStorage={availableStorage}
-          selectedId={selectedId}
+          selectedStorage={availableStorage[selectedId]}
         />
 
         <TextInput