From 540b8310170f599c93811291ce6d3992c323cd42 Mon Sep 17 00:00:00 2001 From: srichman333 Date: Thu, 15 Jun 2023 10:14:16 -0400 Subject: properties view --- src/client/util/SharingManager.scss | 3 ++- src/client/util/SharingManager.tsx | 31 +++++++++++++++++++------------ 2 files changed, 21 insertions(+), 13 deletions(-) (limited to 'src/client/util') diff --git a/src/client/util/SharingManager.scss b/src/client/util/SharingManager.scss index aa1e11ef5..80d5807b4 100644 --- a/src/client/util/SharingManager.scss +++ b/src/client/util/SharingManager.scss @@ -107,6 +107,7 @@ .group-container { width: 50%; display: flex; + top:0; flex-direction: column; .user-sort { @@ -199,7 +200,7 @@ display: flex; position: relative; margin-top: 5px; - margin-bottom: 10px; + // margin-bottom: 10px; font-size: 22px; -webkit-user-select: none; -moz-user-select: none; diff --git a/src/client/util/SharingManager.tsx b/src/client/util/SharingManager.tsx index 6112b5b69..78e502e6e 100644 --- a/src/client/util/SharingManager.tsx +++ b/src/client/util/SharingManager.tsx @@ -526,7 +526,7 @@ export class SharingManager extends React.Component<{}> { docToUse = Doc.GetProto(this.targetDoc!); const userKey = `acl-${normalizeEmail(user.email)}`; - const uniform = docs.map(doc => (this.layoutDocAcls ? doc : doc[DataSym])).every(doc => doc?.[AclSym]?.[userKey] === docs[0]?.[AclSym]?.[userKey]); + const uniform = docs.map(doc => (this.layoutDocAcls ? doc : doc[DocData])).every(doc => doc?.[DocAcl]?.[userKey] === docs[0]?.[DocAcl]?.[userKey]); const permissions = uniform ? StrCast(targetDoc?.[userKey]) : '-multiple-'; return !permissions ? null : ( @@ -574,8 +574,8 @@ export class SharingManager extends React.Component<{}> { const groupListContents = groupListMap.map(group => { const groupKey = `acl-${StrCast(group.title)}`; const uniform = docs - .map(doc => (this.layoutDocAcls ? doc : doc[DataSym])) - .every(doc => (this.layoutDocAcls ? doc?.[AclSym]?.[groupKey] === docs[0]?.[AclSym]?.[groupKey] : doc?.[DataSym]?.[AclSym]?.[groupKey] === docs[0]?.[DataSym]?.[AclSym]?.[groupKey])); + .map(doc => (this.layoutDocAcls ? doc : doc[DocData])) + .every(doc => (this.layoutDocAcls ? doc?.[DocAcl]?.[groupKey] === docs[0]?.[DocAcl]?.[groupKey] : doc?.[DocData]?.[DocAcl]?.[groupKey] === docs[0]?.[DocData]?.[DocAcl]?.[groupKey])); const permissions = uniform ? StrCast(targetDoc?.[`acl-${StrCast(group.title)}`]) : '-multiple-'; return !permissions ? null : ( @@ -670,14 +670,21 @@ export class SharingManager extends React.Component<{}> {
(this.groupSort = this.groupSort === 'ascending' ? 'descending' : this.groupSort === 'descending' ? 'none' : 'ascending'))}> - Groups{' '} - {this.groupSort === 'ascending' ? ( - - ) : this.groupSort === 'descending' ? ( - - ) : ( - - )} +
+ Groups +   +
(GroupManager.Instance?.open()))}> + +
+   + {this.groupSort === 'ascending' ? ( + + ) : this.groupSort === 'descending' ? ( + + ) : ( + + )} +
{groupListContents}
@@ -690,4 +697,4 @@ export class SharingManager extends React.Component<{}> { render() { return ; } -} +} \ No newline at end of file -- cgit v1.2.3-70-g09d2