Merge pull request #1648 from hypothesis/remove-isPrivate-passthru

Make Annotation sub-components compute their own privacy

src/sidebar/components/annotation-action-bar.js

@@ -12,7 +12,6 @@ const Button = require('./button');
  */
 function AnnotationActionBar({
   annotation,
-  isPrivate,
   onDelete,
   onEdit,
   onFlag,
@@ -49,8 +48,8 @@ function AnnotationActionBar({
       <Button icon="reply" title="Reply" onClick={onReply} />
       {showShareAction && (
         <AnnotationShareControl
+          annotation={annotation}
           group={annotationGroup}
-          isPrivate={isPrivate}
           shareUri={shareURI(annotation)}
         />
       )}
@@ -74,8 +73,6 @@ function AnnotationActionBar({
 
 AnnotationActionBar.propTypes = {
   annotation: propTypes.object.isRequired,
-  /** Is this annotation shared at the group level or marked as "only me"/private? */
-  isPrivate: propTypes.bool.isRequired,
   /** Callbacks for when action buttons are clicked/tapped */
   onEdit: propTypes.func.isRequired,
   onDelete: propTypes.func.isRequired,

src/sidebar/components/annotation-header.js

@@ -16,7 +16,6 @@ function AnnotationHeader({
   annotation,
   isEditing,
   isHighlight,
-  isPrivate,
   onReplyCountClick,
   replyCount,
   showDocumentInfo,
@@ -60,7 +59,7 @@ function AnnotationHeader({
       </div>
 
       <div className="annotation-header__row">
-        <AnnotationShareInfo annotation={annotation} isPrivate={isPrivate} />
+        <AnnotationShareInfo annotation={annotation} />
         {!isEditing && isHighlight && (
           <div className="annotation-header__highlight">
             <SvgIcon
@@ -84,8 +83,6 @@ AnnotationHeader.propTypes = {
   isEditing: propTypes.bool,
   /* Whether the annotation is a highlight */
   isHighlight: propTypes.bool,
-  /* Whether the annotation is an "only me" (private) annotation */
-  isPrivate: propTypes.bool,
   /* Callback for when the toggle-replies element is clicked */
   onReplyCountClick: propTypes.func.isRequired,
   /* How many replies this annotation currently has */

src/sidebar/components/annotation-share-control.js

@@ -14,12 +14,17 @@ const SvgIcon = require('./svg-icon');
  * "Popup"-style component for sharing a single annotation.
  */
 function AnnotationShareControl({
+  annotation,
   analytics,
   flash,
   group,
-  isPrivate,
+  permissions,
   shareUri,
 }) {
+  const isPrivate = !permissions.isShared(
+    annotation.permissions,
+    annotation.user
+  );
   const shareRef = useRef();
   const inputRef = useRef();
 
@@ -125,22 +130,23 @@ function AnnotationShareControl({
 }
 
 AnnotationShareControl.propTypes = {
+  /* The annotation in question */
+  annotation: propTypes.object.isRequired,
   /** group that the annotation is in
    *  If missing, this component will not render
    *  FIXME: Refactor after root cause is addressed
    *  See https://github.com/hypothesis/client/issues/1542
    */
   group: propTypes.object,
-  /** Is this annotation set to "only me"/private? */
-  isPrivate: propTypes.bool.isRequired,
   /** The URI to view the annotation on its own */
   shareUri: propTypes.string.isRequired,
 
   /* services */
   analytics: propTypes.object.isRequired,
   flash: propTypes.object.isRequired,
+  permissions: propTypes.object.isRequired,
 };
 
-AnnotationShareControl.injectedProps = ['analytics', 'flash'];
+AnnotationShareControl.injectedProps = ['analytics', 'flash', 'permissions'];
 
 module.exports = withServices(AnnotationShareControl);

src/sidebar/components/annotation-share-info.js

 const propTypes = require('prop-types');
 const { createElement } = require('preact');
 
-const SvgIcon = require('./svg-icon');
-
+const { withServices } = require('../util/service-context');
 const useStore = require('../store/use-store');
 
+const SvgIcon = require('./svg-icon');
+
 /**
  * Render information about what group an annotation is in and
  * whether it is private to the current user (only me)
  */
-function AnnotationShareInfo({ annotation, isPrivate }) {
+function AnnotationShareInfo({ annotation, permissions }) {
   const group = useStore(store => store.getGroup(annotation.group));
 
   // We may not have access to the group object beyond its ID
@@ -19,6 +20,11 @@ function AnnotationShareInfo({ annotation, isPrivate }) {
   // URL (link) returned by the API for this group. Some groups do not have links
   const linkToGroup = hasGroup && group.links && group.links.html;
 
+  const isPrivate = !permissions.isShared(
+    annotation.permissions,
+    annotation.user
+  );
+
   return (
     <div className="annotation-share-info">
       {linkToGroup && (
@@ -59,8 +65,11 @@ function AnnotationShareInfo({ annotation, isPrivate }) {
 AnnotationShareInfo.propTypes = {
   /** The current annotation object for which sharing info will be rendered */
   annotation: propTypes.object.isRequired,
-  /** Is this an "only me" (private) annotation? */
-  isPrivate: propTypes.bool.isRequired,
+
+  /** injected services */
+  permissions: propTypes.object.isRequired,
 };
 
-module.exports = AnnotationShareInfo;
+AnnotationShareInfo.injectedProps = ['permissions'];
+
+module.exports = withServices(AnnotationShareInfo);

src/sidebar/components/test/annotation-header-test.js

@@ -13,7 +13,6 @@ describe('AnnotationHeader', () => {
         annotation={fixtures.defaultAnnotation()}
         isEditing={false}
         isHighlight={false}
-        isPrivate={false}
         onReplyCountClick={sinon.stub()}
         replyCount={0}
         showDocumentInfo={false}

src/sidebar/components/test/annotation-share-control-test.js

@@ -6,10 +6,12 @@ const AnnotationShareControl = require('../annotation-share-control');
 const mockImportedComponents = require('./mock-imported-components');
 
 describe('AnnotationShareControl', () => {
+  let fakeAnnotation;
   let fakeAnalytics;
   let fakeCopyToClipboard;
   let fakeFlash;
   let fakeGroup;
+  let fakePermissions;
   let fakeShareUri;
 
   let container;
@@ -21,10 +23,11 @@ describe('AnnotationShareControl', () => {
   function createComponent(props = {}) {
     return mount(
       <AnnotationShareControl
+        annotation={fakeAnnotation}
         analytics={fakeAnalytics}
         flash={fakeFlash}
         group={fakeGroup}
-        isPrivate={false}
+        permissions={fakePermissions}
         shareUri={fakeShareUri}
         {...props}
       />,
@@ -48,6 +51,12 @@ describe('AnnotationShareControl', () => {
     container = document.createElement('div');
     document.body.appendChild(container);
 
+    fakeAnnotation = {
+      group: 'fakegroup',
+      permissions: {},
+      user: 'acct:bar@foo.com',
+    };
+
     fakeAnalytics = {
       events: {
         ANNOTATION_SHARED: 'whatever',
@@ -64,6 +73,9 @@ describe('AnnotationShareControl', () => {
       name: 'My Group',
       type: 'private',
     };
+    fakePermissions = {
+      isShared: sinon.stub().returns(true),
+    };
     fakeShareUri = 'https://www.example.com';
     AnnotationShareControl.$imports.$mock(mockImportedComponents());
 
@@ -152,26 +164,27 @@ describe('AnnotationShareControl', () => {
   [
     {
       groupType: 'private',
-      isPrivate: false,
+      isShared: true,
       expected: 'Only members of the group My Group may view this annotation.',
     },
     {
       groupType: 'open',
-      isPrivate: false,
+      isShared: true,
       expected: 'Anyone using this link may view this annotation.',
     },
     {
       groupType: 'private',
-      isPrivate: true,
+      isShared: false,
       expected: 'Only you may view this annotation.',
     },
     {
       groupType: 'open',
-      isPrivate: true,
+      isShared: false,
       expected: 'Only you may view this annotation.',
     },
   ].forEach(testcase => {
-    it(`renders the correct sharing information for a ${testcase.groupType} group when annotation privacy is ${testcase.isPrivate}`, () => {
+    it(`renders the correct sharing information for a ${testcase.groupType} group when annotation sharing is ${testcase.isShared}`, () => {
+      fakePermissions.isShared.returns(testcase.isShared);
       fakeGroup.type = testcase.groupType;
       const wrapper = createComponent({ isPrivate: testcase.isPrivate });
       openElement(wrapper);

src/sidebar/components/test/annotation-share-info-test.js

@@ -10,12 +10,13 @@ describe('AnnotationShareInfo', () => {
   let fakeGroup;
   let fakeStore;
   let fakeGetGroup;
+  let fakePermissions;
 
   const createAnnotationShareInfo = props => {
     return mount(
       <AnnotationShareInfo
         annotation={fixtures.defaultAnnotation()}
-        isPrivate={false}
+        permissions={fakePermissions}
         {...props}
       />
     );
@@ -31,6 +32,9 @@ describe('AnnotationShareInfo', () => {
     };
     fakeGetGroup = sinon.stub().returns(fakeGroup);
     fakeStore = { getGroup: fakeGetGroup };
+    fakePermissions = {
+      isShared: sinon.stub().returns(true),
+    };
 
     AnnotationShareInfo.$imports.$mock(mockImportedComponents());
     AnnotationShareInfo.$imports.$mock({
@@ -96,15 +100,19 @@ describe('AnnotationShareInfo', () => {
 
   describe('"only you" information', () => {
     it('should not show privacy information if annotation is not private', () => {
-      const wrapper = createAnnotationShareInfo({ isPrivate: false });
+      const wrapper = createAnnotationShareInfo();
 
       const privacy = wrapper.find('.annotation-share-info__private');
 
       assert.notOk(privacy.exists());
     });
     context('private annotation', () => {
+      beforeEach(() => {
+        fakePermissions.isShared.returns(false);
+      });
+
       it('should show privacy icon', () => {
-        const wrapper = createAnnotationShareInfo({ isPrivate: true });
+        const wrapper = createAnnotationShareInfo();
 
         const privacyIcon = wrapper.find(
           '.annotation-share-info__private .annotation-share-info__icon'
@@ -114,7 +122,7 @@ describe('AnnotationShareInfo', () => {
         assert.equal(privacyIcon.prop('name'), 'lock');
       });
       it('should not show "only me" text for first-party group', () => {
-        const wrapper = createAnnotationShareInfo({ isPrivate: true });
+        const wrapper = createAnnotationShareInfo();
 
         const privacyText = wrapper.find(
           '.annotation-share-info__private-info'
@@ -124,7 +132,7 @@ describe('AnnotationShareInfo', () => {
       });
       it('should show "only me" text for annotation in third-party group', () => {
         fakeGetGroup.returns({ name: 'Some Name' });
-        const wrapper = createAnnotationShareInfo({ isPrivate: true });
+        const wrapper = createAnnotationShareInfo();
 
         const privacyText = wrapper.find(
           '.annotation-share-info__private-info'

src/sidebar/templates/annotation.html

@@ -7,7 +7,6 @@
   <annotation-header annotation="vm.annotation"
                          is-editing="vm.editing()"
                          is-highlight="vm.isHighlight()"
-                         is-private="vm.state().isPrivate"
                          on-reply-count-click="vm.onReplyCountClick()"
                          reply-count="vm.replyCount"
                          show-document-info="vm.showDocumentInfo">
@@ -34,15 +33,15 @@
       ng-click="vm.toggleCollapseBody($event)"
       ng-title="vm.collapseBody ? 'Show the full annotation text' : 'Show the first few lines only'"
       ng-bind="vm.collapseBody ? 'More' : 'Less'"
-      h-branding="accentColor">mire</a>
+      h-branding="accentColor">more</a>
   </div>
   <!-- Tags -->
   <tag-editor
     ng-if="vm.editing()"
     annotation="vm.annotation"
     on-edit-tags="vm.setTags(tags)"
-    tag-list="vm.state().tags" 
-    />
+    tag-list="vm.state().tags"
+  >
   </tag-editor>
 
   <tag-list
@@ -81,7 +80,6 @@
     <div class="annotation-actions" ng-if="!vm.isSaving && !vm.editing() && vm.id()">
       <annotation-action-bar
         annotation="vm.annotation"
-        is-private="vm.state().isPrivate"
         on-delete="vm.delete()"
         on-flag="vm.flag()"
         on-edit="vm.edit()"