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

Web: Removed changing watermark data if it does not pass the conditions

Browse Source
This commit is contained in:
Tatiana Lopaeva 2024-05-14 16:27:32 +03:00
parent 5476c53716
commit ea78cff437
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/client/src/components/GlobalEvents/EditRoomEvent.js
View File

@ -83,6 +83,7 @@ const EditRoomEvent = ({
setWatermarks,
watermarksSettings,
isNotWatermarkSet,
}) => {
const { t } = useTranslation(["CreateEditRoomDialog", "Common", "Files"]);
@ -193,7 +194,7 @@ const EditRoomEvent = ({
if (removedTags.length)
actions.push(removeTagsFromRoom(room.id, removedTags));
if (watermarksSettings) {
if (watermarksSettings && !isNotWatermarkSet()) {
const request = !watermarksSettings.enabled
? deleteWatermarkSettings(room.id)
: setWatermarkSettings(room.id, watermarksSettings);
@ -367,7 +368,8 @@ export default inject(
const { updateInfoPanelSelection } = infoPanelStore;
const { defaultRoomsQuota, isDefaultRoomsQuotaSet } = currentQuotaStore;
const { setWatermarks, watermarksSettings } = createEditRoomStore;
const { setWatermarks, watermarksSettings, isNotWatermarkSet } =
createEditRoomStore;
return {
defaultRoomsQuota,
@ -407,6 +409,7 @@ export default inject(
changeRoomOwner,
setWatermarks,
watermarksSettings,
isNotWatermarkSet,
};
},
)(observer(EditRoomEvent));

2
packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/Watermarks/ViewerInfo.js
View File

@ -127,7 +127,7 @@ const ViewerInfoWatermark = ({
rotate: getInitialRotate(watermarksSettings?.rotate, isEdit, t),
tabs: getInitialTabs(watermarksSettings?.additions, isEdit, t),
text: getInitialText(watermarksSettings?.text, isEdit),
additions: watermarksSettings?.additions ?? WatermarkAdditions.UserName,
additions: watermarksSettings?.additions || WatermarkAdditions.UserName,
};
elements.current = getInitialState(initialInfo.current.tabs);

6
packages/client/src/store/CreateEditRoomStore.js
View File

@ -119,8 +119,8 @@ class CreateEditRoomStore {
};
isNotWatermarkSet = () => {
console.log(!this.isImageType && this.watermarksSettings.additions === 0);
if (this.isImageType && !this.watermarksSettings.imageUrl) return true;
if (this.isImageType && !this.watermarksSettings.image) return true;
if (!this.isImageType && this.watermarksSettings.additions === 0)
return true;
@ -226,7 +226,7 @@ class CreateEditRoomStore {
const requests = [];
if (this.watermarksSettings) {
if (this.watermarksSettings && !this.isNotWatermarkSet()) {
requests.push(this.getWatermarkRequest(room));
}
// delete thirdparty account if not needed