IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web: Refactoring, fixed bugs after merge.

Browse Source
This commit is contained in:
Tatiana Lopaeva 2022-08-12 17:32:22 +03:00
parent 055102cdac
commit e5846be9ad
4 changed files with 52 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/sub-components/ThirdPartyStorageModule.js
View File

@ -8,6 +8,7 @@ import RackspaceStorage from "./storages/RackspaceStorage";
import SelectelStorage from "./storages/SelectelStorage";
import AmazonStorage from "./storages/AmazonStorage";
import { StyledAutoBackup } from "../../StyledBackup";
import { getOptions } from "../../common-container/GetThirdPartyStoragesOptions";
class ThirdPartyStorageModule extends React.PureComponent {
constructor(props) {

29
packages/client/src/pages/PortalSettings/categories/data-management/backup/consumer-storage-settings/GoogleCloudSettings.js
View File

@ -1,7 +1,6 @@
import React from "react";
import { inject, observer } from "mobx-react";
import TextInput from "@docspace/components/text-input";
//import { onChangeTextInput } from "./InputsMethods";
const bucket = "bucket";
const filePath = "filePath";
@ -27,15 +26,13 @@ class GoogleCloudSettings extends React.Component {
selectedStorage && selectedStorage.properties[0].title;
}
onChangeText = (e) => {
const {
formSettings,
setFormSettings,
setIsThirdStorageChanged,
} = this.props;
// const newState = onChangeTextInput(formSettings, e);
// setIsThirdStorageChanged(true);
// setFormSettings(newState);
onChangeText = (event) => {
const { addValueInFormSettings } = this.props;
const { target } = event;
const value = target.value;
const name = target.name;
addValueInFormSettings(name, value);
};
render() {
const {
@ -53,8 +50,8 @@ class GoogleCloudSettings extends React.Component {
name={bucket}
className="backup_text-input"
scale
value={formSettings.bucket}
hasError={isError?.bucket}
value={formSettings[bucket]}
hasError={isError[bucket]}
onChange={this.onChangeText}
isDisabled={isLoadingData || isLoading || this.isDisabled}
placeholder={this.bucketPlaceholder || ""}
@ -63,15 +60,15 @@ class GoogleCloudSettings extends React.Component {
{isNeedFilePath && (
<TextInput
name="filePath"
name={filePath}
className="backup_text-input"
scale
value={formSettings.filePath}
value={formSettings[filePath]}
onChange={this.onChangeText}
isDisabled={isLoadingData || isLoading || this.isDisabled}
placeholder={t("Path")}
tabIndex={2}
hasError={isError?.filePath}
hasError={isError[filePath]}
/>
)}
</>
@ -86,6 +83,7 @@ export default inject(({ backup }) => {
formSettings,
errorsFieldsBeforeSafe,
setIsThirdStorageChanged,
addValueInFormSettings,
} = backup;
return {
@ -94,5 +92,6 @@ export default inject(({ backup }) => {
formSettings,
errorsFieldsBeforeSafe,
setIsThirdStorageChanged,
addValueInFormSettings,
};
})(observer(GoogleCloudSettings));

39
packages/client/src/pages/PortalSettings/categories/data-management/backup/consumer-storage-settings/RackspaceSettings.js
View File

@ -1,7 +1,6 @@
import React from "react";
import TextInput from "@docspace/components/text-input";
import { inject, observer } from "mobx-react";
//import { onChangeTextInput } from "./InputsMethods";
const regionInput = "region";
const publicInput = "public_container";
@ -39,16 +38,16 @@ class RackspaceSettings extends React.Component {
this.regionPlaceholder =
selectedStorage && selectedStorage.properties[2].title;
}
onChangeText = (e) => {
const {
formSettings,
setFormSettings,
setIsThirdStorageChanged,
} = this.props;
//const newState = onChangeTextInput(formSettings, e);
// setIsThirdStorageChanged(true);
// setFormSettings(newState);
onChangeText = (event) => {
const { addValueInFormSettings } = this.props;
const { target } = event;
const value = target.value;
const name = target.name;
addValueInFormSettings(name, value);
};
render() {
const {
formSettings,
@ -65,8 +64,8 @@ class RackspaceSettings extends React.Component {
name={privateInput}
className="backup_text-input"
scale
value={formSettings.private_container}
hasError={isError?.private_container}
value={formSettings[private_container]}
hasError={isError[private_container]}
onChange={this.onChangeText}
isDisabled={isLoadingData || isLoading || this.isDisabled}
placeholder={this.privatePlaceholder || ""}
@ -76,8 +75,8 @@ class RackspaceSettings extends React.Component {
name={publicInput}
className="backup_text-input"
scale
value={formSettings.public_container}
hasError={isError?.public_container}
value={formSettings[public_container]}
hasError={isError[public_container]}
onChange={this.onChangeText}
isDisabled={isLoadingData || isLoading || this.isDisabled}
placeholder={this.publicPlaceholder || ""}
@ -87,8 +86,8 @@ class RackspaceSettings extends React.Component {
name={regionInput}
className="backup_text-input"
scale
value={formSettings.region}
hasError={isError?.region}
value={formSettings[region]}
hasError={isError[region]}
onChange={this.onChangeText}
isDisabled={isLoadingData || isLoading || this.isDisabled}
placeholder={this.regionPlaceholder || ""}
@ -96,15 +95,15 @@ class RackspaceSettings extends React.Component {
/>
{isNeedFilePath && (
<TextInput
name="filePath"
name={filePath}
className="backup_text-input"
scale
value={formSettings.filePath}
value={formSettings[filePath]}
onChange={this.onChangeText}
isDisabled={isLoadingData || isLoading || this.isDisabled}
placeholder={t("Path")}
tabIndex={4}
hasError={isError?.filePath}
hasError={isError[filePath]}
/>
)}
</>
@ -119,6 +118,7 @@ export default inject(({ backup }) => {
formSettings,
errorsFieldsBeforeSafe,
setIsThirdStorageChanged,
addValueInFormSettings,
} = backup;
return {
@ -127,5 +127,6 @@ export default inject(({ backup }) => {
formSettings,
errorsFieldsBeforeSafe,
setIsThirdStorageChanged,
addValueInFormSettings,
};
})(observer(RackspaceSettings));

34
packages/client/src/pages/PortalSettings/categories/data-management/backup/consumer-storage-settings/SelectelSettings.js
View File

@ -1,7 +1,6 @@
import React from "react";
import { inject, observer } from "mobx-react";
import TextInput from "@docspace/components/text-input";
//import { onChangeTextInput } from "./InputsMethods";
const publicInput = "public_container";
const privateInput = "private_container";
@ -32,15 +31,14 @@ class SelectelSettings extends React.Component {
selectedStorage && selectedStorage.properties[1].title;
}
onChangeText = (e) => {
const {
formSettings,
setFormSettings,
setIsThirdStorageChanged,
} = this.props;
// const newState = onChangeTextInput(formSettings, e);
// setIsThirdStorageChanged(true);
// setFormSettings(newState);
onChangeText = (event) => {
const { addValueInFormSettings } = this.props;
const { target } = event;
const value = target.value;
const name = target.name;
addValueInFormSettings(name, value);
};
render() {
const {
@ -58,8 +56,8 @@ class SelectelSettings extends React.Component {
name={privateInput}
className="backup_text-input"
scale={true}
value={formSettings.private_container}
hasError={isError?.private_container}
value={formSettings[private_container]}
hasError={isError[private_container]}
onChange={this.onChangeText}
isDisabled={isLoadingData || isLoading || this.isDisabled}
placeholder={this.privatePlaceholder || ""}
@ -69,8 +67,8 @@ class SelectelSettings extends React.Component {
name={publicInput}
className="backup_text-input"
scale={true}
value={formSettings.public_container}
hasError={isError?.public_container}
value={formSettings[public_container]}
hasError={isError[public_container]}
onChange={this.onChangeText}
isDisabled={isLoadingData || isLoading || this.isDisabled}
placeholder={this.publicPlaceholder || ""}
@ -79,15 +77,15 @@ class SelectelSettings extends React.Component {
{isNeedFilePath && (
<TextInput
name="filePath"
name={filePath}
className="backup_text-input"
scale
value={formSettings.filePath}
value={formSettings[filePath]}
onChange={this.onChangeText}
isDisabled={isLoadingData || isLoading || this.isDisabled}
placeholder={t("Path")}
tabIndex={3}
hasError={isError?.filePath}
hasError={isError[filePath]}
/>
)}
</>
@ -102,6 +100,7 @@ export default inject(({ backup }) => {
formSettings,
errorsFieldsBeforeSafe,
setIsThirdStorageChanged,
addValueInFormSettings,
} = backup;
return {
@ -110,5 +109,6 @@ export default inject(({ backup }) => {
formSettings,
errorsFieldsBeforeSafe,
setIsThirdStorageChanged,
addValueInFormSettings,
};
})(observer(SelectelSettings));