From 7dfa50a23e99c65098e2000b67ed497bf41dfc0c Mon Sep 17 00:00:00 2001 From: Viktor Fomin Date: Tue, 2 Feb 2021 00:36:18 +0300 Subject: [PATCH 01/10] Web: Files: delete files without notification --- .../pages/Home/Section/Header/index.js | 133 +++++++++++++++++- 1 file changed, 131 insertions(+), 2 deletions(-) diff --git a/products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js b/products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js index f5eb45a6f7..43f44e0d46 100644 --- a/products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js +++ b/products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js @@ -28,6 +28,8 @@ import { setIsLoading, setSelected, setSharingPanelVisible, + setTreeFolders, + setUpdateTree, } from "../../../../../store/files/actions"; import { TIMEOUT } from "../../../../../helpers/constants"; import { @@ -56,8 +58,13 @@ import { getIsThirdPartySelection, getIsPrivacyFolder, getOnlyFoldersSelected, + getSettingsTreeConfirmDelete, + loopTreeFolders, + getTreeFolders, } from "../../../../../store/files/selectors"; +const { files } = api; + const { isAdmin, isDesktopClient, getIsTabletView } = store.auth.selectors; const { FilterType, FileAction } = constants; const { tablet, desktop } = utils.device; @@ -356,8 +363,126 @@ class SectionHeaderContent extends React.Component { onOpenSharingPanel = () => this.props.setSharingPanelVisible(!this.props.sharingPanelVisible); - onDeleteAction = () => - this.setState({ showDeleteDialog: !this.state.showDeleteDialog }); + loopDeleteOperation = (id) => { + const { + currentFolderId, + filter, + treeFolders, + setTreeFolders, + isRecycleBin, + setSecondaryProgressBarData, + clearSecondaryProgressData, + t, + fetchFiles, + setUpdateTree, + } = this.props; + const successMessage = t("DeleteSelectedElem"); + api.files + .getProgress() + .then((res) => { + const currentProcess = res.find((x) => x.id === id); + if (currentProcess && currentProcess.progress !== 100) { + setSecondaryProgressBarData({ + icon: "trash", + percent: currentProcess.progress, + label: t("DeleteOperation"), + visible: true, + alert: false, + }); + setTimeout(() => this.loopDeleteOperation(id), 1000); + } else { + setSecondaryProgressBarData({ + icon: "trash", + percent: 100, + label: t("DeleteOperation"), + visible: true, + alert: false, + }); + setTimeout(() => clearSecondaryProgressData(), TIMEOUT); + fetchFiles(currentFolderId, filter).then((data) => { + if (!isRecycleBin) { + const path = data.selectedFolder.pathParts.slice(0); + const newTreeFolders = treeFolders; + const folders = data.selectedFolder.folders; + const foldersCount = data.selectedFolder.foldersCount; + loopTreeFolders(path, newTreeFolders, folders, foldersCount); + setUpdateTree(true); + setTreeFolders(newTreeFolders); + } + toastr.success(successMessage); + }); + } + }) + .catch((err) => { + setSecondaryProgressBarData({ + visible: true, + alert: true, + }); + //toastr.error(err); + setTimeout(() => clearSecondaryProgressData(), TIMEOUT); + }); + }; + + onDelete = () => { + const { + isRecycleBin, + isPrivacy, + t, + setSecondaryProgressBarData, + clearSecondaryProgressData, + selection, + } = this.props; + + const deleteAfter = true; //Delete after finished + const immediately = isRecycleBin || isPrivacy ? true : false; //Don't move to the Recycle Bin + + const folderIds = []; + const fileIds = []; + + let i = 0; + while (selection.length !== i) { + if (selection[i].fileExst) { + fileIds.push(selection[i].id); + } else { + folderIds.push(selection[i].id); + } + i++; + } + + if (folderIds.length || fileIds.length) { + setSecondaryProgressBarData({ + icon: "trash", + visible: true, + label: t("DeleteOperation"), + percent: 0, + alert: false, + }); + + files + .removeFiles(folderIds, fileIds, deleteAfter, immediately) + .then((res) => { + const id = res[0] && res[0].id ? res[0].id : null; + this.loopDeleteOperation(id); + }) + .catch((err) => { + setSecondaryProgressBarData({ + visible: true, + alert: true, + }); + //toastr.error(err); + setTimeout(() => clearSecondaryProgressData(), TIMEOUT); + }); + } + }; + + onDeleteAction = () => { + console.log(this.props.confirmDelete); + if (this.props.confirmDelete) { + this.setState({ showDeleteDialog: !this.state.showDeleteDialog }); + } else { + this.onDelete(); + } + }; onEmptyTrashAction = () => this.setState({ showEmptyTrashDialog: !this.state.showEmptyTrashDialog }); @@ -744,6 +869,8 @@ const mapStateToProps = (state) => { isThirdPartySelection: getIsThirdPartySelection(state), isOnlyFoldersSelected: getOnlyFoldersSelected(state), isTabletView: getIsTabletView(state), + confirmDelete: getSettingsTreeConfirmDelete(state), + treeFolders: getTreeFolders(state), }; }; @@ -755,4 +882,6 @@ export default connect(mapStateToProps, { fetchFiles, setSelected, setSharingPanelVisible, + setTreeFolders, + setUpdateTree, })(withTranslation()(withRouter(SectionHeaderContent))); From 19a5526af4bdbb7f86c47857306550c18b887e5a Mon Sep 17 00:00:00 2001 From: Viktor Fomin Date: Tue, 2 Feb 2021 00:40:09 +0300 Subject: [PATCH 02/10] Web: Files: added success message translate --- .../Client/src/components/pages/Home/Section/Header/index.js | 2 +- .../src/components/pages/Home/locales/en/translation.json | 3 ++- .../src/components/pages/Home/locales/ru/translation.json | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js b/products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js index 43f44e0d46..cc943352d9 100644 --- a/products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js +++ b/products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js @@ -476,7 +476,7 @@ class SectionHeaderContent extends React.Component { }; onDeleteAction = () => { - console.log(this.props.confirmDelete); + //console.log(this.props.confirmDelete); if (this.props.confirmDelete) { this.setState({ showDeleteDialog: !this.state.showDeleteDialog }); } else { diff --git a/products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json b/products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json index e95b358646..66421eef5a 100644 --- a/products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json +++ b/products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json @@ -125,5 +125,6 @@ "EncryptedFileCreating": "File {{itemTitle}} successfully created", "DeleteThirdParty": "Delete third party", "ThirdPartyInfo": "Change the third party info", - "EmptyFile": "Empty file" + "EmptyFile": "Empty file", + "DeleteSelectedElem": "Selected elements were successfully deleted" } diff --git a/products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json b/products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json index 4ea332fe1a..831efa2b63 100644 --- a/products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json +++ b/products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json @@ -125,5 +125,6 @@ "EncryptedFileCreating": "Создан новый файл {{itemTitle}}", "DeleteThirdParty": "Отключить сторонний ресурс", "ThirdPartyInfo": "Изменить настройки подключения", - "EmptyFile": "Пустой файл" + "EmptyFile": "Пустой файл", + "DeleteSelectedElem": "Выбранные элементы успешно удалены" } From 4774a35c406b6e74ea9887bfa08c51190bf580f8 Mon Sep 17 00:00:00 2001 From: Viktor Fomin Date: Tue, 2 Feb 2021 15:34:29 +0300 Subject: [PATCH 03/10] Web: Files: added translate --- .../Client/src/components/dialogs/EmptyTrashDialog/index.js | 2 +- .../dialogs/EmptyTrashDialog/locales/en/translation.json | 4 +++- .../dialogs/EmptyTrashDialog/locales/ru/translation.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/products/ASC.Files/Client/src/components/dialogs/EmptyTrashDialog/index.js b/products/ASC.Files/Client/src/components/dialogs/EmptyTrashDialog/index.js index cf771dd2d2..0c94c9e2c6 100644 --- a/products/ASC.Files/Client/src/components/dialogs/EmptyTrashDialog/index.js +++ b/products/ASC.Files/Client/src/components/dialogs/EmptyTrashDialog/index.js @@ -45,7 +45,7 @@ const EmptyTrashDialogComponent = (props) => { const loopEmptyTrash = useCallback( (id) => { - const successMessage = "Success empty recycle bin"; + const successMessage = t("SuccessEmptyTrash"); api.files .getProgress() .then((res) => { diff --git a/products/ASC.Files/Client/src/components/dialogs/EmptyTrashDialog/locales/en/translation.json b/products/ASC.Files/Client/src/components/dialogs/EmptyTrashDialog/locales/en/translation.json index 4fe5af15e2..807debcc95 100644 --- a/products/ASC.Files/Client/src/components/dialogs/EmptyTrashDialog/locales/en/translation.json +++ b/products/ASC.Files/Client/src/components/dialogs/EmptyTrashDialog/locales/en/translation.json @@ -5,5 +5,7 @@ "EmptyTrashDialogQuestion": "Are you sure you want to empty the recycle bin?", "EmptyTrashDialogMessage": "Note: This action can not be undone. Note: removal from your account can not be undone.", - "DeleteOperation": "Deleting" + "DeleteOperation": "Deleting", + "SuccessEmptyTrash": "Success empty recycle bin" + } diff --git a/products/ASC.Files/Client/src/components/dialogs/EmptyTrashDialog/locales/ru/translation.json b/products/ASC.Files/Client/src/components/dialogs/EmptyTrashDialog/locales/ru/translation.json index e2d1bd6e9e..716632bd9d 100644 --- a/products/ASC.Files/Client/src/components/dialogs/EmptyTrashDialog/locales/ru/translation.json +++ b/products/ASC.Files/Client/src/components/dialogs/EmptyTrashDialog/locales/ru/translation.json @@ -5,5 +5,6 @@ "EmptyTrashDialogQuestion": "Вы уверены, что хотите очистить корзину?", "EmptyTrashDialogMessage": "Замечание: Это действие не может быть отменено.", - "DeleteOperation": "Удаление" + "DeleteOperation": "Удаление", + "SuccessEmptyTrash": "Корзина успешно очищена" } From 793a28715c1beb4e67296e066e7080a85ece417a Mon Sep 17 00:00:00 2001 From: Viktor Fomin Date: Tue, 2 Feb 2021 15:38:26 +0300 Subject: [PATCH 04/10] Web: Files: added translate --- .../Client/src/components/pages/Home/Section/Header/index.js | 4 +++- .../src/components/pages/Home/locales/en/translation.json | 3 ++- .../src/components/pages/Home/locales/ru/translation.json | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js b/products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js index cc943352d9..b84ecfe211 100644 --- a/products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js +++ b/products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js @@ -376,7 +376,9 @@ class SectionHeaderContent extends React.Component { fetchFiles, setUpdateTree, } = this.props; - const successMessage = t("DeleteSelectedElem"); + const successMessage = isRecycleBin + ? t("DeleteFromTrash") + : t("DeleteSelectedElem"); api.files .getProgress() .then((res) => { diff --git a/products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json b/products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json index 66421eef5a..2b9e26ee90 100644 --- a/products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json +++ b/products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json @@ -126,5 +126,6 @@ "DeleteThirdParty": "Delete third party", "ThirdPartyInfo": "Change the third party info", "EmptyFile": "Empty file", - "DeleteSelectedElem": "Selected elements were successfully deleted" + "DeleteSelectedElem": "Selected elements were successfully deleted", + "DeleteFromTrash": "Selected elements were successfully deleted from trash" } diff --git a/products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json b/products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json index 831efa2b63..4c5e75955e 100644 --- a/products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json +++ b/products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json @@ -126,5 +126,6 @@ "DeleteThirdParty": "Отключить сторонний ресурс", "ThirdPartyInfo": "Изменить настройки подключения", "EmptyFile": "Пустой файл", - "DeleteSelectedElem": "Выбранные элементы успешно удалены" + "DeleteSelectedElem": "Выбранные элементы успешно удалены", + "DeleteFromTrash": "Выбранные элементы успешно удалены из корзины" } From 05d1359e39f2fff5c5d878dfedfec9d72399d3a4 Mon Sep 17 00:00:00 2001 From: Viktor Fomin Date: Tue, 2 Feb 2021 15:40:04 +0300 Subject: [PATCH 05/10] Web: Files: added translate --- .../Client/src/components/dialogs/DeleteDialog/index.js | 4 +++- .../dialogs/DeleteDialog/locales/en/translation.json | 3 ++- .../dialogs/DeleteDialog/locales/ru/translation.json | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js b/products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js index 3627826c22..609166c825 100644 --- a/products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js +++ b/products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js @@ -83,7 +83,9 @@ class DeleteDialogComponent extends React.Component { fetchFiles, setUpdateTree, } = this.props; - const successMessage = t("DeleteSelectedElem"); + const successMessage = isRecycleBinFolder + ? t("DeleteFromTrash") + : t("DeleteSelectedElem"); api.files .getProgress() .then((res) => { diff --git a/products/ASC.Files/Client/src/components/dialogs/DeleteDialog/locales/en/translation.json b/products/ASC.Files/Client/src/components/dialogs/DeleteDialog/locales/en/translation.json index 6e427148f1..aaca2fbfc5 100644 --- a/products/ASC.Files/Client/src/components/dialogs/DeleteDialog/locales/en/translation.json +++ b/products/ASC.Files/Client/src/components/dialogs/DeleteDialog/locales/en/translation.json @@ -11,5 +11,6 @@ "QuestionDeleteFolder": "Are you sure you want to delete this folder?", "QuestionDeleteElements": "Are you sure you want to delete these elements?", "DeleteOperation": "Deleting", - "DeleteSelectedElem": "Selected elements were successfully deleted" + "DeleteSelectedElem": "Selected elements were successfully deleted", + "DeleteFromTrash": "Selected elements were successfully deleted from trash" } diff --git a/products/ASC.Files/Client/src/components/dialogs/DeleteDialog/locales/ru/translation.json b/products/ASC.Files/Client/src/components/dialogs/DeleteDialog/locales/ru/translation.json index 750237e141..9a8cb89c1f 100644 --- a/products/ASC.Files/Client/src/components/dialogs/DeleteDialog/locales/ru/translation.json +++ b/products/ASC.Files/Client/src/components/dialogs/DeleteDialog/locales/ru/translation.json @@ -12,5 +12,6 @@ "QuestionDeleteFolder": "Вы собираетесь удалить эту папку?", "QuestionDeleteElements": "Вы собираетесь удалить эти элементы?", "DeleteOperation": "Удаление", - "DeleteSelectedElem": "Выбранные элементы успешно удалены" + "DeleteSelectedElem": "Выбранные элементы успешно удалены", + "DeleteFromTrash": "Выбранные элементы успешно удалены из корзины" } From 2cadd58cf5ec9925543d77dfad23bbb6fcadd51b Mon Sep 17 00:00:00 2001 From: Alexey Kostenko Date: Tue, 2 Feb 2021 18:13:27 +0300 Subject: [PATCH 06/10] Web: Files: Do not show the pencil icon in Row, if user can't to edit the a document --- .../components/pages/Home/Section/Body/FilesRowContent.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js b/products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js index 8b0916fe5d..096eb124a3 100644 --- a/products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js +++ b/products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js @@ -53,7 +53,7 @@ import EditingWrapperComponent from "./EditingWrapperComponent"; import { isMobile } from "react-device-detect"; import { setEncryptionAccess } from "../../../../../helpers/desktop"; -const { FileAction } = constants; +const { FileAction, ShareAccessRights } = constants; const sideColor = "#A3A9AE"; const { getSettings, isDesktopClient } = initStore.auth.selectors; const { getEncryptionAccess, replaceFileStream } = initStore.auth.actions; @@ -534,6 +534,9 @@ class FilesRowContent extends React.PureComponent { createdBy.displayName); const updatedDate = updated && this.getStatusByDate(); + const accessToEdit = + item.access === ShareAccessRights.FullAccess || + item.access === ShareAccessRights.None; // TODO: fix access type for owner (now - None) const isEdit = id === editingId && fileExst === fileAction.extension; const linkStyles = isTrashFolder || window.innerWidth <= 1024 @@ -614,7 +617,7 @@ class FilesRowContent extends React.PureComponent { hoverColor="#3B72A7" /> )} */} - {canWebEdit && !isTrashFolder && ( + {canWebEdit && !isTrashFolder && accessToEdit && ( Date: Wed, 3 Feb 2021 14:31:41 +0300 Subject: [PATCH 07/10] Web: Components: Added internal link icon --- web/ASC.Web.Components/src/components/icons/svg/index.js | 5 +++++ .../src/components/icons/svg/internal.link.react.svg | 3 +++ 2 files changed, 8 insertions(+) create mode 100644 web/ASC.Web.Components/src/components/icons/svg/internal.link.react.svg diff --git a/web/ASC.Web.Components/src/components/icons/svg/index.js b/web/ASC.Web.Components/src/components/icons/svg/index.js index 3cd0275044..55e6a33ea1 100644 --- a/web/ASC.Web.Components/src/components/icons/svg/index.js +++ b/web/ASC.Web.Components/src/components/icons/svg/index.js @@ -211,6 +211,7 @@ import OrigButtonAlertIcon from "./button.alert.react.svg"; import OrigButtonCancelIcon from "./button.cancel.react.svg"; import OrigLoadErrorIcon from "./load.error.react.svg"; import OrigClearActiveIcon from "./clear.active.react.svg"; +import OrigInternalLinkIcon from "./internal.link.react.svg"; export const AZSortingIcon = createStyledIcon( OrigAZSortingIcon, @@ -827,3 +828,7 @@ export const IntegrationIcon = createStyledIcon( OrigIntegrationIcon, "IntegrationIcon" ); +export const InternalLinkIcon = createStyledIcon( + OrigInternalLinkIcon, + "InternalLinkIcon" +); diff --git a/web/ASC.Web.Components/src/components/icons/svg/internal.link.react.svg b/web/ASC.Web.Components/src/components/icons/svg/internal.link.react.svg new file mode 100644 index 0000000000..874b12c501 --- /dev/null +++ b/web/ASC.Web.Components/src/components/icons/svg/internal.link.react.svg @@ -0,0 +1,3 @@ + + + From da2216c005e642c4dcfec25221de8b6c62688b70 Mon Sep 17 00:00:00 2001 From: Alexey Kostenko Date: Wed, 3 Feb 2021 14:39:32 +0300 Subject: [PATCH 08/10] Web: Files: Changed internal link icon --- .../Client/src/components/panels/SharingPanel/linkRow.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js b/products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js index e136d228bd..f803196873 100644 --- a/products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js +++ b/products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js @@ -47,7 +47,7 @@ class LinkRow extends React.Component { isDisabled={isDisabled} /> ) : ( - From 5a343565f47ddf82a6ef45c1ea78a2f3acaf535c Mon Sep 17 00:00:00 2001 From: Alexey Kostenko Date: Wed, 3 Feb 2021 16:03:23 +0300 Subject: [PATCH 09/10] Web: Files: SharingPanel: ComboBox button style fix --- .../components/panels/AddGroupsPanel/index.js | 2 ++ .../components/panels/AddUsersPanel/index.js | 2 ++ .../panels/SharingPanel/AccessComboBox.js | 6 ++++- .../src/components/panels/StyledPanels.js | 22 ++++++++++++------- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/products/ASC.Files/Client/src/components/panels/AddGroupsPanel/index.js b/products/ASC.Files/Client/src/components/panels/AddGroupsPanel/index.js index c7f6b82ae2..86bf047d82 100644 --- a/products/ASC.Files/Client/src/components/panels/AddGroupsPanel/index.js +++ b/products/ASC.Files/Client/src/components/panels/AddGroupsPanel/index.js @@ -148,6 +148,7 @@ class AddGroupsPanelComponent extends React.Component { } showCounter diff --git a/products/ASC.Files/Client/src/components/panels/AddUsersPanel/index.js b/products/ASC.Files/Client/src/components/panels/AddUsersPanel/index.js index c2d2251b95..330b200b6f 100644 --- a/products/ASC.Files/Client/src/components/panels/AddUsersPanel/index.js +++ b/products/ASC.Files/Client/src/components/panels/AddUsersPanel/index.js @@ -140,6 +140,7 @@ class AddUsersPanelComponent extends React.Component { directionX="right" onAccessChange={this.onAccessChange} accessOptions={accessOptions} + arrowIconColor="#000000" /> ), } @@ -180,6 +181,7 @@ class AddUsersPanelComponent extends React.Component { { itemId, onAccessChange, t, + arrowIconColor, } = props; const { FullAccess, @@ -100,12 +101,15 @@ const AccessComboBox = (props) => { ); const accessIcon = getAccessIcon(access); + const selectedOption = arrowIconColor + ? { key: 0, arrowIconColor } + : { key: 0 }; return ( Date: Wed, 3 Feb 2021 16:15:47 +0300 Subject: [PATCH 10/10] Web: Component: Removed duplicate icon --- .../Client/src/components/panels/SharingPanel/linkRow.js | 4 +++- web/ASC.Web.Components/src/components/icons/svg/index.js | 5 ----- .../src/components/icons/svg/internal.link.react.svg | 3 --- 3 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 web/ASC.Web.Components/src/components/icons/svg/internal.link.react.svg diff --git a/products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js b/products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js index f803196873..84c5725116 100644 --- a/products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js +++ b/products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js @@ -47,9 +47,11 @@ class LinkRow extends React.Component { isDisabled={isDisabled} /> ) : ( - ) } diff --git a/web/ASC.Web.Components/src/components/icons/svg/index.js b/web/ASC.Web.Components/src/components/icons/svg/index.js index 55e6a33ea1..3cd0275044 100644 --- a/web/ASC.Web.Components/src/components/icons/svg/index.js +++ b/web/ASC.Web.Components/src/components/icons/svg/index.js @@ -211,7 +211,6 @@ import OrigButtonAlertIcon from "./button.alert.react.svg"; import OrigButtonCancelIcon from "./button.cancel.react.svg"; import OrigLoadErrorIcon from "./load.error.react.svg"; import OrigClearActiveIcon from "./clear.active.react.svg"; -import OrigInternalLinkIcon from "./internal.link.react.svg"; export const AZSortingIcon = createStyledIcon( OrigAZSortingIcon, @@ -828,7 +827,3 @@ export const IntegrationIcon = createStyledIcon( OrigIntegrationIcon, "IntegrationIcon" ); -export const InternalLinkIcon = createStyledIcon( - OrigInternalLinkIcon, - "InternalLinkIcon" -); diff --git a/web/ASC.Web.Components/src/components/icons/svg/internal.link.react.svg b/web/ASC.Web.Components/src/components/icons/svg/internal.link.react.svg deleted file mode 100644 index 874b12c501..0000000000 --- a/web/ASC.Web.Components/src/components/icons/svg/internal.link.react.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -