From c5023c71527b9aa5dd788beafee55b895c682158 Mon Sep 17 00:00:00 2001 From: srichman333 Date: Fri, 7 Jul 2023 10:53:30 -0400 Subject: default is to override nested docs --- src/client/util/SharingManager.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/client') diff --git a/src/client/util/SharingManager.tsx b/src/client/util/SharingManager.tsx index 64b2bb5b8..67b4d9d1a 100644 --- a/src/client/util/SharingManager.tsx +++ b/src/client/util/SharingManager.tsx @@ -79,7 +79,7 @@ export class SharingManager extends React.Component<{}> { @observable private showGroupOptions: boolean = false; // // whether to show groups as options when sharing (in the react-select component) private populating: boolean = false; // whether the list of users is populating or not @observable private layoutDocAcls: boolean = false; // whether the layout doc or data doc's acls are to be used - @observable private overrideNested: boolean = false; // whether child docs in a collection/dashboard should be changed to be less private + @observable private overrideNested: boolean = false; // whether child docs in a collection/dashboard should be changed to be less private - initially selected so default is override @observable private myDocAcls: boolean = false; // whether the My Docs checkbox is selected or not // private get linkVisible() { @@ -94,6 +94,7 @@ export class SharingManager extends React.Component<{}> { DictationOverlay.Instance.hasActiveModal = true; this.isOpen = this.targetDoc !== undefined; this.permissions = SharingPermissions.Augment; + this.overrideNested = true; }); }; @@ -202,7 +203,7 @@ export class SharingManager extends React.Component<{}> { const isDashboard = DocListCast(Doc.MyDashboards.data).indexOf(target) !== -1; // setting the same acl for a docs within the doc being shared if they haven't been set yet - // or if the 'Override Private' checkbox is selected + // or if the 'Override Nested' checkbox is selected var childDocs = DocListCast(target.data); childDocs.map(doc => { if (this.overrideNested || doc[acl] == undefined) { @@ -457,7 +458,6 @@ export class SharingManager extends React.Component<{}> { ); this.layoutDocAcls = false; - this.overrideNested = false; this.selectedUsers = null; } }; -- cgit v1.2.3-70-g09d2 From dd628b8b175d866fc39342a3f91e62bda3b63ba3 Mon Sep 17 00:00:00 2001 From: srichman333 Date: Fri, 7 Jul 2023 13:04:21 -0400 Subject: guest permission fixes --- src/client/util/SharingManager.tsx | 2 +- src/client/views/PropertiesView.tsx | 3 +-- src/fields/util.ts | 6 +++++- 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'src/client') diff --git a/src/client/util/SharingManager.tsx b/src/client/util/SharingManager.tsx index 67b4d9d1a..3a0672113 100644 --- a/src/client/util/SharingManager.tsx +++ b/src/client/util/SharingManager.tsx @@ -582,7 +582,7 @@ export class SharingManager extends React.Component<{}> { ) : null, - sameAuthor && targetDoc?.author !== Doc.CurrentUserEmail ? ( + sameAuthor && targetDoc?.author !== Doc.CurrentUserEmail && Doc.CurrentUserEmail != 'guest' ? (
Me
diff --git a/src/client/views/PropertiesView.tsx b/src/client/views/PropertiesView.tsx index 14291b537..2b12a7b58 100644 --- a/src/client/views/PropertiesView.tsx +++ b/src/client/views/PropertiesView.tsx @@ -463,8 +463,7 @@ export class PropertiesView extends React.Component { // adds current user var userEmail = Doc.CurrentUserEmail; const userKey = `acl-${normalizeEmail(userEmail)}`; - if (userEmail == 'guest') userEmail = 'Public'; - if (!usersAdded.includes(userEmail) && userEmail != 'Public' && userEmail != target.author) { + if (!usersAdded.includes(userEmail) && userEmail != 'guest' && userEmail != target.author) { var permission; if (this.layoutDocAcls){ if (target[DocAcl][userKey]) permission = HierarchyMapping.get(target[DocAcl][userKey])?.name; diff --git a/src/fields/util.ts b/src/fields/util.ts index cc29c7df9..068323dce 100644 --- a/src/fields/util.ts +++ b/src/fields/util.ts @@ -209,9 +209,13 @@ export function SetCachedGroups(groups: string[]) { } function getEffectiveAcl(target: any, user?: string): symbol { const targetAcls = target[DocAcl]; - if (targetAcls?.['acl-Me'] === AclAdmin || GetCachedGroupByName('Admin')) return AclAdmin; + // if (targetAcls?.['acl-Me'] === AclAdmin || GetCachedGroupByName('Admin')) return AclAdmin; const userChecked = user || Doc.CurrentUserEmail; // if the current user is the author of the document / the current user is a member of the admin group + + // guest dashboard permissions error + if (userChecked == 'guest' && target._type_collection == CollectionViewType.Docking) return AclAugment; + if (targetAcls && Object.keys(targetAcls).length) { let effectiveAcl = AclPrivate; for (const [key, value] of Object.entries(targetAcls)) { -- cgit v1.2.3-70-g09d2 From aaaea6344e74b2d4585dccbc0ca3f0249d6dacd6 Mon Sep 17 00:00:00 2001 From: srichman333 Date: Fri, 7 Jul 2023 13:19:14 -0400 Subject: no layout in DocumentDecorations --- src/client/views/DocumentDecorations.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/client') diff --git a/src/client/views/DocumentDecorations.tsx b/src/client/views/DocumentDecorations.tsx index cdd9e62d8..4cd172034 100644 --- a/src/client/views/DocumentDecorations.tsx +++ b/src/client/views/DocumentDecorations.tsx @@ -832,14 +832,14 @@ export class DocumentDecorations extends React.Component<{ PanelWidth: number; P   {shareSymbolIcon + ' ' + shareMode}   - {!Doc.noviceMode ? ( + {/* {!Doc.noviceMode ? (
(this.showLayoutAcl = !this.showLayoutAcl))} />
Layout
- ) : null} + ) : null} */}  
-- cgit v1.2.3-70-g09d2