Fixed Bug 60696 - Files.The name of the folder selection dialog is missing.

This commit is contained in:
Tatiana Lopaeva 2023-01-20 17:35:25 +03:00
parent a0d59d4d7d
commit 0098a566dd
6 changed files with 8 additions and 49 deletions

View File

@ -17,7 +17,6 @@ const StyledModalDialog = styled(ModalDialog)`
}
`;
const SelectFolderDialogAsideView = ({
theme,
t,
isPanelVisible,
onClose,
@ -41,7 +40,6 @@ const SelectFolderDialogAsideView = ({
const isLoaded = folderId && resultingFolderTree;
return (
<StyledModalDialog
theme={theme}
visible={isPanelVisible}
onClose={onClose}
withoutBodyScroll
@ -49,11 +47,10 @@ const SelectFolderDialogAsideView = ({
displayType="aside"
isDoubleFooterLine
>
<ModalDialog.Header theme={theme}>
<ModalDialog.Header>
<StyledAsideHeader>
{withFileSelectDialog && (
<IconButton
theme={theme}
className="selection-panel_aside-header-icon"
size="16"
iconName="/static/images/arrow.path.react.svg"
@ -63,8 +60,8 @@ const SelectFolderDialogAsideView = ({
{dialogName}
</StyledAsideHeader>
</ModalDialog.Header>
<ModalDialog.Body theme={theme}>
<StyledAsideBody theme={theme} header={!!header} footer={!!footer}>
<ModalDialog.Body>
<StyledAsideBody header={!!header} footer={!!footer}>
<div className="selection-panel_aside-body">
<div className="selection-panel_aside-header">
<div>{header}</div>
@ -86,7 +83,6 @@ const SelectFolderDialogAsideView = ({
<FolderTreeBody
selectionFiles={selectionFiles}
parentId={parentId}
theme={theme}
folderTree={resultingFolderTree}
onSelect={onSelectFolder}
withoutProvider={withoutProvider}
@ -109,7 +105,6 @@ const SelectFolderDialogAsideView = ({
{footer}
<div>
<Button
theme={theme}
className="select-folder-dialog-buttons-save"
primary
scale

View File

@ -191,7 +191,6 @@ class SelectFolderDialog extends React.Component {
render() {
const {
t,
theme,
isPanelVisible,
zIndex,
withoutProvider,
@ -236,7 +235,6 @@ class SelectFolderDialog extends React.Component {
return displayType === "aside" ? (
<SelectFolderDialogAsideView
selectionFiles={selectionFiles}
theme={theme}
t={t}
isPanelVisible={isPanelVisible}
zIndex={zIndex}
@ -265,7 +263,6 @@ class SelectFolderDialog extends React.Component {
<SelectionPanel
selectionFiles={selectionFiles}
t={t}
theme={theme}
isPanelVisible={isPanelVisible}
onClose={this.onClose}
withoutProvider={withoutProvider}
@ -321,7 +318,6 @@ export default inject(
selectedFolderStore,
selectFolderDialogStore,
filesStore,
auth,
filesActionsStore,
},
{ selectedId }
@ -347,12 +343,9 @@ export default inject(
securityItem,
} = selectFolderDialogStore;
const { settingsStore } = auth;
const { theme } = settingsStore;
const selectedFolderId = selectedId ? selectedId : id;
return {
theme: theme,
storeFolderId: selectedFolderId,
providerKey,
folderTitle,

View File

@ -22,7 +22,6 @@ const FilesListBody = ({
displayType,
folderId,
fileId,
theme,
page,
folderSelection,
getIcon,
@ -92,13 +91,8 @@ const FilesListBody = ({
return (
<div style={style}>
<StyledItemsLoader key="loader">
<Loader
theme={theme}
type="oval"
size="16px"
className="panel-loader"
/>
<Text theme={theme} as="span">
<Loader type="oval" size="16px" className="panel-loader" />
<Text as="span">
{t("Common:LoadingProcessing")} {t("Common:LoadingDescription")}
</Text>
</StyledItemsLoader>
@ -145,7 +139,6 @@ const FilesListBody = ({
return (
<div style={style}>
<FilesListRow
theme={theme}
displayType={displayType}
index={index}
onSelectFile={onSelectFile}
@ -169,7 +162,6 @@ const FilesListBody = ({
<AutoSizer>
{({ width, height }) => (
<InfiniteLoader
theme={theme}
ref={filesListRef}
isItemLoaded={isItemLoaded}
itemCount={itemCount}
@ -177,7 +169,6 @@ const FilesListBody = ({
>
{({ onItemsRendered, ref }) => (
<List
theme={theme}
height={maxHeight}
itemCount={itemCount}
itemSize={48}
@ -196,7 +187,6 @@ const FilesListBody = ({
{!hasNextPage && itemCount === 0 && (
<div className="select-file-dialog_empty-container">
<EmptyContainer
theme={theme}
headerText={t("Files:EmptyFolderHeader")}
imageSrc="/static/images/empty.screen.react.svg"
/>

View File

@ -8,7 +8,6 @@ const FilesListRow = ({
index,
onSelectFile,
isChecked,
theme,
folderSelection,
icon,
item,
@ -22,7 +21,6 @@ const FilesListRow = ({
return (
<StyledRow
displayType={displayType}
theme={theme}
isChecked={isChecked}
folderSelection={folderSelection}
onClick={onFileClick}
@ -36,7 +34,6 @@ const FilesListRow = ({
<div className="selection-panel_checkbox">
{!folderSelection && (
<RadioButton
//theme={theme}
fontSize="13px"
fontWeight="400"
name={`${index}`}

View File

@ -113,7 +113,6 @@ class FilesListWrapper extends React.Component {
render() {
const {
t,
theme,
onSelectFile,
folderSelection = false,
fileId,
@ -124,7 +123,6 @@ class FilesListWrapper extends React.Component {
return (
<FilesListBody
theme={theme}
files={files}
onSelectFile={onSelectFile}
hasNextPage={hasNextPage}
@ -150,11 +148,7 @@ export default inject(
setProviderKey,
} = selectFolderDialogStore;
const { settingsStore } = auth;
const { theme } = settingsStore;
return {
theme: theme,
storeFolderId: id,
setResultingFolderId,
setFolderTitle,

View File

@ -29,7 +29,6 @@ const SelectionPanelBody = ({
filesListTitle,
dialogName,
primaryButtonName,
theme,
isLoading,
onButtonClick,
folderId,
@ -53,7 +52,6 @@ const SelectionPanelBody = ({
const isLoaded = folderId && resultingFolderTree;
return (
<StyledModalDialog
theme={theme}
visible={isPanelVisible}
onClose={onClose}
displayType="modal"
@ -62,10 +60,10 @@ const SelectionPanelBody = ({
isDoubleFooterLine
autoMaxWidth
>
<ModalDialog.Header theme={theme} className={"select-panel-modal-header"}>
<ModalDialog.Header className={"select-panel-modal-header"}>
{dialogName}
</ModalDialog.Header>
<ModalDialog.Body theme={theme} className="select-file_body-modal-dialog">
<ModalDialog.Body className="select-file_body-modal-dialog">
<StyledBody header={!!header} footer={!!footer}>
<div className="selection-panel_body">
<div className="selection-panel_tree-body">
@ -90,7 +88,6 @@ const SelectionPanelBody = ({
{isLoaded ? (
<FolderTreeBody
selectionFiles={selectionFiles}
theme={theme}
folderTree={resultingFolderTree}
onSelect={onSelectFolder}
withoutProvider={withoutProvider}
@ -111,11 +108,7 @@ const SelectionPanelBody = ({
<div className="selection-panel_files-header">
{header}
<Text
color="#A3A9AE"
theme={theme}
className="selection-panel_title"
>
<Text color="#A3A9AE" className="selection-panel_title">
{folderSelection
? t("FolderContents", { folderTitle })
: filesListTitle}
@ -123,7 +116,6 @@ const SelectionPanelBody = ({
</div>
<FilesListWrapper
theme={theme}
onSelectFile={onSelectFile}
folderId={folderId}
displayType={"modal"}
@ -143,7 +135,6 @@ const SelectionPanelBody = ({
<div>
<Button
id="select-file-modal-submit"
theme={theme}
className="select-file-modal-dialog-buttons-save"
primary
size="normal"
@ -158,7 +149,6 @@ const SelectionPanelBody = ({
/>
<Button
id="select-file-modal-cancel"
theme={theme}
className="modal-dialog-button"
size="normal"
label={t("Common:CancelButton")}