Display document views (#849)

* Display who has viewed a document in the header

* Add overflow, display of WHEN last viewed
Cleanup old document attributes
Add firstViewedAt, lastViewedAt to API response

* Cleanup

* Added: API documentation for views endpoints

* Include views for deleted users

app/components/Actions.js

@@ -8,6 +8,7 @@ export const Action = styled(Flex)`
   align-items: center;
   padding: 0 0 0 12px;
   font-size: 15px;
+  flex-shrink: 0;
 
   a {
     color: ${props => props.theme.text};

app/components/Collaborators.js

@@ -1,64 +1,133 @@
 // @flow
 import * as React from 'react';
+import { observer, inject } from 'mobx-react';
+import { filter } from 'lodash';
 import distanceInWordsToNow from 'date-fns/distance_in_words_to_now';
 import styled from 'styled-components';
 import Flex from 'shared/components/Flex';
 import Avatar from 'components/Avatar';
 import Tooltip from 'components/Tooltip';
 import Document from 'models/Document';
+import ViewsStore from 'stores/ViewsStore';
 
-type Props = { document: Document };
+const MAX_DISPLAY = 6;
 
-const Collaborators = ({ document }: Props) => {
+type Props = {
-  const {
+  views: ViewsStore,
-    createdAt,
+  document: Document,
-    updatedAt,
-    createdBy,
-    updatedBy,
-    collaborators,
-  } = document;
-  let tooltip;
-
-  if (createdAt === updatedAt) {
-    tooltip = `${createdBy.name} published ${distanceInWordsToNow(
-      new Date(createdAt)
-    )} ago`;
-  } else {
-    tooltip = `${updatedBy.name} modified ${distanceInWordsToNow(
-      new Date(updatedAt)
-    )} ago`;
-  }
-
-  return (
-    <Avatars>
-      {collaborators.map(user => (
-        <Tooltip
-          tooltip={collaborators.length > 1 ? user.name : tooltip}
-          placement="bottom"
-          key={user.id}
-        >
-          <AvatarWrapper>
-            <Avatar src={user.avatarUrl} />
-          </AvatarWrapper>
-        </Tooltip>
-      ))}
-    </Avatars>
-  );
 };
 
-const AvatarWrapper = styled.div`
+@observer
-  width: 24px;
+class Collaborators extends React.Component<Props> {
-  height: 24px;
+  componentDidMount() {
-  margin-right: -10px;
+    this.props.views.fetchPage({ documentId: this.props.document.id });
+  }
+
+  render() {
+    const { document, views } = this.props;
+    const documentViews = views.inDocument(document.id);
+    const {
+      createdAt,
+      updatedAt,
+      createdBy,
+      updatedBy,
+      collaborators,
+    } = document;
+    let tooltip;
+
+    if (createdAt === updatedAt) {
+      tooltip = `${createdBy.name} published ${distanceInWordsToNow(
+        new Date(createdAt)
+      )} ago`;
+    } else {
+      tooltip = `${updatedBy.name} updated ${distanceInWordsToNow(
+        new Date(updatedAt)
+      )} ago`;
+    }
+
+    // filter to only show views that haven't collaborated
+    const collaboratorIds = collaborators.map(user => user.id);
+    const viewersNotCollaborators = filter(
+      documentViews,
+      view => !collaboratorIds.includes(view.user.id)
+    );
+
+    // only show the most recent viewers, the rest can overflow
+    const mostRecentViewers = viewersNotCollaborators.slice(
+      0,
+      MAX_DISPLAY - collaborators.length
+    );
+
+    // if there are too many to display then add a (+X) to the UI
+    const overflow = viewersNotCollaborators.length - mostRecentViewers.length;
+
+    return (
+      <Avatars>
+        {overflow > 0 && <More>+{overflow}</More>}
+        {mostRecentViewers.map(({ lastViewedAt, user }) => (
+          <StyledTooltip
+            key={user.id}
+            tooltip={`${user.name} viewed ${distanceInWordsToNow(
+              new Date(lastViewedAt)
+            )} ago`}
+            placement="bottom"
+          >
+            <Viewer>
+              <Avatar src={user.avatarUrl} />
+            </Viewer>
+          </StyledTooltip>
+        ))}
+        {collaborators.map(user => (
+          <StyledTooltip
+            key={user.id}
+            tooltip={collaborators.length > 1 ? user.name : tooltip}
+            placement="bottom"
+          >
+            <Collaborator>
+              <Avatar src={user.avatarUrl} />
+            </Collaborator>
+          </StyledTooltip>
+        ))}
+      </Avatars>
+    );
+  }
+}
+
+const StyledTooltip = styled(Tooltip)`
+  margin-right: -8px;
 
   &:first-child {
     margin-right: 0;
   }
 `;
 
+const Viewer = styled.div`
+  width: 24px;
+  height: 24px;
+  opacity: 0.75;
+`;
+
+const Collaborator = styled.div`
+  width: 24px;
+  height: 24px;
+`;
+
+const More = styled.div`
+  min-width: 30px;
+  height: 24px;
+  border-radius: 12px;
+  background: ${props => props.theme.slate};
+  color: ${props => props.theme.text};
+  border: 2px solid #fff;
+  text-align: center;
+  line-height: 20px;
+  font-size: 11px;
+  font-weight: 600;
+`;
+
 const Avatars = styled(Flex)`
   align-items: center;
   flex-direction: row-reverse;
 `;
 
-export default Collaborators;
+export default inject('views')(Collaborators);

app/models/Document.js

@@ -1,5 +1,5 @@
 // @flow
-import { action, set, computed, observable } from 'mobx';
+import { action, set, computed } from 'mobx';
 import invariant from 'invariant';
 
 import { client } from 'utils/ApiClient';
@@ -22,7 +22,6 @@ export default class Document extends BaseModel {
   collaborators: User[];
   collection: Collection;
   collectionId: string;
-  firstViewedAt: ?string;
   lastViewedAt: ?string;
   createdAt: string;
   createdBy: User;
@@ -40,9 +39,7 @@ export default class Document extends BaseModel {
   url: string;
   urlId: string;
   shareUrl: ?string;
-  views: number;
   revision: number;
-  @observable embedsDisabled: ?boolean;
 
   constructor(data?: Object = {}, store: *) {
     super(data, store);
@@ -144,16 +141,6 @@ export default class Document extends BaseModel {
     }
   };
 
-  @action
-  enableEmbeds = () => {
-    this.embedsDisabled = false;
-  };
-
-  @action
-  disableEmbeds = () => {
-    this.embedsDisabled = true;
-  };
-
   @action
   star = async () => {
     this.starred = true;
@@ -178,8 +165,7 @@ export default class Document extends BaseModel {
 
   @action
   view = async () => {
-    this.views++;
+    await client.post('/views.create', { documentId: this.id });
-    await client.post('/views.create', { id: this.id });
   };
 
   @action

app/models/View.js

@@ -0,0 +1,14 @@
+// @flow
+import BaseModel from './BaseModel';
+import User from './User';
+
+class View extends BaseModel {
+  id: string;
+  documentId: string;
+  firstViewedAt: string;
+  lastViewedAt: string;
+  count: number;
+  user: User;
+}
+
+export default View;

app/scenes/Document/Document.js

@@ -310,8 +310,7 @@ class DocumentScene extends React.Component<Props> {
       );
     }
 
-    const embedsDisabled =
+    const embedsDisabled = team && !team.documentEmbeds;
-      document.embedsDisabled || (team && !team.documentEmbeds);
 
     return (
       <ErrorBoundary>

app/stores/DocumentsStore.js

@@ -13,7 +13,6 @@ import type { FetchOptions, PaginationParams, SearchResult } from 'types';
 
 export default class DocumentsStore extends BaseStore<Document> {
   @observable recentlyViewedIds: string[] = [];
-  @observable recentlyUpdatedIds: string[] = [];
 
   constructor(rootStore: RootStore) {
     super(rootStore, Document);
@@ -30,11 +29,7 @@ export default class DocumentsStore extends BaseStore<Document> {
 
   @computed
   get recentlyUpdated(): * {
-    return orderBy(
+    return orderBy(Array.from(this.data.values()), 'updatedAt', 'desc');
-      compact(this.recentlyUpdatedIds.map(id => this.data.get(id))),
-      'updatedAt',
-      'desc'
-    );
   }
 
   createdByUser(userId: string): * {
@@ -139,15 +134,7 @@ export default class DocumentsStore extends BaseStore<Document> {
 
   @action
   fetchRecentlyUpdated = async (options: ?PaginationParams): Promise<*> => {
-    const data = await this.fetchNamedPage('list', options);
+    return this.fetchNamedPage('list', options);
-
-    runInAction('DocumentsStore#fetchRecentlyUpdated', () => {
-      // $FlowFixMe
-      this.recentlyUpdatedIds.replace(
-        uniq(this.recentlyUpdatedIds.concat(map(data, 'id')))
-      );
-    });
-    return data;
   };
 
   @action
@@ -308,7 +295,6 @@ export default class DocumentsStore extends BaseStore<Document> {
 
     runInAction(() => {
       this.recentlyViewedIds = without(this.recentlyViewedIds, document.id);
-      this.recentlyUpdatedIds = without(this.recentlyUpdatedIds, document.id);
     });
 
     const collection = this.getCollectionForDocument(document);

app/stores/RootStore.js

@@ -9,6 +9,7 @@ import RevisionsStore from './RevisionsStore';
 import SharesStore from './SharesStore';
 import UiStore from './UiStore';
 import UsersStore from './UsersStore';
+import ViewsStore from './ViewsStore';
 
 export default class RootStore {
   apiKeys: ApiKeysStore;
@@ -21,6 +22,7 @@ export default class RootStore {
   shares: SharesStore;
   ui: UiStore;
   users: UsersStore;
+  views: ViewsStore;
 
   constructor() {
     this.apiKeys = new ApiKeysStore(this);
@@ -33,6 +35,7 @@ export default class RootStore {
     this.shares = new SharesStore(this);
     this.ui = new UiStore();
     this.users = new UsersStore(this);
+    this.views = new ViewsStore(this);
   }
 
   logout() {
@@ -44,5 +47,6 @@ export default class RootStore {
     this.revisions.clear();
     this.shares.clear();
     this.users.clear();
+    this.views.clear();
   }
 }

app/stores/ViewsStore.js

@@ -0,0 +1,21 @@
+// @flow
+import { filter, orderBy } from 'lodash';
+import BaseStore from './BaseStore';
+import RootStore from './RootStore';
+import View from 'models/View';
+
+export default class ViewsStore extends BaseStore<View> {
+  actions = ['list'];
+
+  constructor(rootStore: RootStore) {
+    super(rootStore, View);
+  }
+
+  inDocument(documentId: string): View[] {
+    return orderBy(
+      filter(this.orderedData, view => view.documentId !== documentId),
+      'lastViewedAt',
+      'desc'
+    );
+  }
+}

server/api/documents.js

@@ -148,7 +148,7 @@ router.post('documents.starred', auth(), pagination(), async ctx => {
   const user = ctx.state.user;
   const collectionIds = await user.collectionIds();
 
-  const views = await Star.findAll({
+  const stars = await Star.findAll({
     where: {
       userId: user.id,
     },
@@ -175,7 +175,7 @@ router.post('documents.starred', auth(), pagination(), async ctx => {
   });
 
   const data = await Promise.all(
-    views.map(view => presentDocument(ctx, view.document))
+    stars.map(star => presentDocument(ctx, star.document))
   );
 
   ctx.body = {

server/api/views.js

@@ -2,51 +2,47 @@
 import Router from 'koa-router';
 import auth from '../middlewares/authentication';
 import { presentView } from '../presenters';
-import { View, Document } from '../models';
+import { View, Document, User } from '../models';
 import policy from '../policies';
 
 const { authorize } = policy;
 const router = new Router();
 
 router.post('views.list', auth(), async ctx => {
-  const { id } = ctx.body;
+  const { documentId } = ctx.body;
-  ctx.assertUuid(id, 'id is required');
+  ctx.assertUuid(documentId, 'documentId is required');
 
   const user = ctx.state.user;
-  const document = await Document.findById(id);
+  const document = await Document.findById(documentId);
   authorize(user, 'read', document);
 
   const views = await View.findAll({
-    where: { documentId: id },
+    where: { documentId },
     order: [['updatedAt', 'DESC']],
+    include: [
+      {
+        model: User,
+        paranoid: false,
+      },
+    ],
   });
 
-  let users = [];
+  const data = views.map(view => presentView(ctx, view));
-  let count = 0;
-  await Promise.all(
-    views.map(async view => {
-      count = view.count;
-      return users.push(await presentView(ctx, view));
-    })
-  );
 
   ctx.body = {
-    data: {
+    data,
-      users,
-      count,
-    },
   };
 });
 
 router.post('views.create', auth(), async ctx => {
-  const { id } = ctx.body;
+  const { documentId } = ctx.body;
-  ctx.assertUuid(id, 'id is required');
+  ctx.assertUuid(documentId, 'documentId is required');
 
   const user = ctx.state.user;
-  const document = await Document.findById(id);
+  const document = await Document.findById(documentId);
   authorize(user, 'read', document);
 
-  await View.increment({ documentId: document.id, userId: user.id });
+  await View.increment({ documentId, userId: user.id });
 
   ctx.body = {
     success: true,

server/api/views.test.js

@@ -1,6 +1,7 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from 'fetch-test-server';
 import app from '..';
+import { View } from '../models';
 import { flushdb, seed } from '../test/support';
 import { buildUser } from '../test/factories';
 
@@ -12,16 +13,22 @@ afterAll(server.close);
 describe('#views.list', async () => {
   it('should return views for a document', async () => {
     const { user, document } = await seed();
+    await View.increment({ documentId: document.id, userId: user.id });
+
     const res = await server.post('/api/views.list', {
-      body: { token: user.getJwtToken(), id: document.id },
+      body: { token: user.getJwtToken(), documentId: document.id },
     });
+    const body = await res.json();
+
     expect(res.status).toEqual(200);
+    expect(body.data[0].count).toBe(1);
+    expect(body.data[0].user.name).toBe(user.name);
   });
 
   it('should require authentication', async () => {
     const { document } = await seed();
     const res = await server.post('/api/views.list', {
-      body: { id: document.id },
+      body: { documentId: document.id },
     });
     const body = await res.json();
 
@@ -33,7 +40,7 @@ describe('#views.list', async () => {
     const { document } = await seed();
     const user = await buildUser();
     const res = await server.post('/api/views.list', {
-      body: { token: user.getJwtToken(), id: document.id },
+      body: { token: user.getJwtToken(), documentId: document.id },
     });
     expect(res.status).toEqual(403);
   });
@@ -43,7 +50,7 @@ describe('#views.create', async () => {
   it('should allow creating a view record for document', async () => {
     const { user, document } = await seed();
     const res = await server.post('/api/views.create', {
-      body: { token: user.getJwtToken(), id: document.id },
+      body: { token: user.getJwtToken(), documentId: document.id },
     });
     const body = await res.json();
 
@@ -54,7 +61,7 @@ describe('#views.create', async () => {
   it('should require authentication', async () => {
     const { document } = await seed();
     const res = await server.post('/api/views.create', {
-      body: { id: document.id },
+      body: { documentId: document.id },
     });
     const body = await res.json();
 
@@ -66,7 +73,7 @@ describe('#views.create', async () => {
     const { document } = await seed();
     const user = await buildUser();
     const res = await server.post('/api/views.create', {
-      body: { token: user.getJwtToken(), id: document.id },
+      body: { token: user.getJwtToken(), documentId: document.id },
     });
     expect(res.status).toEqual(403);
   });

server/pages/developers/Api.js

@@ -560,6 +560,27 @@ export default function Pricing() {
               <Argument id="id" description="Share ID" required />
             </Arguments>
           </Method>
+
+          <Method method="views.list" label="List document views">
+            <Description>
+              List all users that have viewed a document and the overall view
+              count.
+            </Description>
+            <Arguments>
+              <Argument id="documentId" description="Document ID" required />
+            </Arguments>
+          </Method>
+
+          <Method method="views.create" label="Create a document view">
+            <Description>
+              Creates a new view for a document. This is documented in the
+              interests of thoroughness however it is recommended that views are
+              not created from outside of the Outline UI.
+            </Description>
+            <Arguments>
+              <Argument id="documentId" description="Document ID" required />
+            </Arguments>
+          </Method>
         </Methods>
       </Content>
     </Grid>

server/presenters/document.js

@@ -32,8 +32,6 @@ async function present(ctx: Object, document: Document, options: ?Options) {
     updatedAt: document.updatedAt,
     updatedBy: undefined,
     publishedAt: document.publishedAt,
-    firstViewedAt: undefined,
-    lastViewedAt: undefined,
     team: document.teamId,
     collaborators: [],
     starred: !!(document.starred && document.starred.length),
@@ -41,7 +39,6 @@ async function present(ctx: Object, document: Document, options: ?Options) {
     pinned: undefined,
     collectionId: undefined,
     collection: undefined,
-    views: undefined,
   };
 
   if (!options.isPublic) {
@@ -54,12 +51,6 @@ async function present(ctx: Object, document: Document, options: ?Options) {
       data.collection = await presentCollection(ctx, document.collection);
     }
 
-    if (document.views && document.views.length === 1) {
-      data.views = document.views[0].count;
-      data.firstViewedAt = document.views[0].createdAt;
-      data.lastViewedAt = document.views[0].updatedAt;
-    }
-
     // This could be further optimized by using ctx.cache
     data.collaborators = await User.findAll({
       where: {

server/presenters/view.js

@@ -1,18 +1,16 @@
 // @flow
-import { View, User } from '../models';
+import { View } from '../models';
 import { presentUser } from '../presenters';
 
-async function present(ctx: Object, view: View) {
+function present(ctx: Object, view: View) {
-  let data = {
+  return {
+    id: view.id,
+    documentId: view.documentId,
     count: view.count,
-    user: undefined,
+    firstViewedAt: view.createdAt,
+    lastViewedAt: view.updatedAt,
+    user: presentUser(ctx, view.user),
   };
-  const user = await ctx.cache.get(
-    view.userId,
-    async () => await User.findById(view.userId)
-  );
-  data.user = await presentUser(ctx, user);
-  return data;
 }
 
 export default present;