Merge pull request codeforboston#1534 from codeforboston/revert-1506-…

…1431-privacy-setting

Revert "Privacy Setting - Adjusting "Browse Testimony""

components/db/profile/profile.ts

@@ -95,9 +95,8 @@ export function useProfile() {
           if (profile) {
             await updateUserDisplayNameTestimonies(
               uid,
-              isPublic ? profile.fullName ?? "Anonymous" : "private",
-              profile.fullName ?? "Anonymous",
-              isPublic
+              isPublic ? profile.fullName ?? "Anonymous" : "<private user>",
+              profile.fullName ?? "Anonymous"
             )
           }
           await updateIsPublic(uid, isPublic)
@@ -129,7 +128,11 @@ export function useProfile() {
         if (uid && fullName !== profile?.fullName) {
           dispatch({ updatingFullName: true })
           // Update the displayName for user's testimonies
-          await updateUserDisplayNameTestimonies(uid, fullName, fullName)
+          await updateUserDisplayNameTestimonies(
+            uid,
+            profile?.public ? fullName : "<private user>",
+            fullName
+          )
           await updateFullName(uid, fullName)
           dispatch({ updatingFullName: false })
         }

components/db/testimony/types.ts

@@ -3,7 +3,6 @@ import { Timestamp } from "firebase/firestore"
 import { httpsCallable } from "firebase/functions"
 import {
   Array,
-  Boolean,
   InstanceOf,
   Literal as L,
   Number,
@@ -45,9 +44,7 @@ export const Testimony = BaseTestimony.extend({
   authorRole: Role,
   billTitle: String,
   version: Number,
-  public: Boolean,
   publishedAt: InstanceOf(Timestamp),
-  updatedAt: InstanceOf(Timestamp),
   representativeId: Optional(String),
   senatorId: Optional(String),
   senatorDistrict: Optional(String),

components/db/testimony/updateUserTestimonies.ts

@@ -1,27 +1,32 @@
-import { collection, getDocs, writeBatch } from "firebase/firestore"
+import {
+  collection,
+  collectionGroup,
+  getDocs,
+  query,
+  updateDoc,
+  where,
+  writeBatch
+} from "firebase/firestore"
 import { firestore } from "../../firebase"
 
 // Updates the displayName for all testimonies under specified user
 export const updateUserDisplayNameTestimonies = async (
   uid: string,
   displayName: string,
-  fullName: string,
-  isPublic?: boolean
+  fullName: string
 ) => {
   const batch = writeBatch(firestore)
   return getAllTestimony(uid).then(({ publishedTestimony, draftTestimony }) => {
     publishedTestimony.forEach(doc =>
       batch.update(doc.ref, {
         authorDisplayName: displayName,
-        fullName: fullName,
-        public: isPublic
+        fullName: fullName
       })
     )
     draftTestimony.forEach(doc =>
       batch.update(doc.ref, {
         authorDisplayName: displayName,
-        fullName: fullName,
-        public: isPublic
+        fullName: fullName
       })
     )
     batch.commit().then(result => result)

components/db/testimony/useEditTestimony.test.ts

@@ -26,7 +26,7 @@ beforeEach(async () => {
 })
 
 let draft: DraftTestimony,
-  testimony: Omit<Testimony, "publishedAt" | "id" | "updatedAt">,
+  testimony: Omit<Testimony, "publishedAt" | "id">,
   updatedDraft: typeof draft,
   updatedTestimony: typeof testimony
 beforeEach(() => {
@@ -46,7 +46,6 @@ beforeEach(() => {
     fullName: "Anonymous",
     court: court,
     position: draft.position,
-    public: true,
     version: 1
   }
   updatedDraft = { ...draft, content: "update", position: "oppose" }

components/moderation/setUp/MockRecords.tsx

@@ -40,13 +40,11 @@ export const createMockTestimony = (
     billTitle: "An act" + loremIpsum({ count: 2, units: "words" }),
     version: 2,
     publishedAt: Timestamp.fromDate(new Date()),
-    updatedAt: Timestamp.fromDate(new Date()),
     billId: billId ?? "H1002",
     court: 192,
     position: "oppose",
     content: loremIpsum({ count: 5, units: "words" }),
-    fullName: "Anonymous",
-    public: true
+    fullName: "Anonymous"
   }
   return testimony
 }

components/search/testimony/TestimonyHit.tsx

@@ -33,10 +33,10 @@ const TestimonyResult = ({ hit }: { hit: Hit<Testimony> }) => {
   const committee = bill?.currentCommittee
   const isOrg = hit.authorRole === "organization"
   const writtenBy =
-    isOrg || hit.public ? (
-      <Link href={`/profile?id=${hit.authorUid}`}>{hit.fullName}</Link>
+    isOrg || hit.authorDisplayName !== "<private user>" ? (
+      <Link href={`/profile?id=${hit.authorUid}`}>{hit.authorDisplayName}</Link>
     ) : (
-      hit.fullName
+      hit.authorDisplayName
     )
   const { followOrg } = useFlags()
 

components/search/testimony/TestimonySearch.tsx

@@ -110,10 +110,7 @@ const Layout = () => {
           : ["user", "organization"]
       return {
         ...prevState,
-        refinementList: {
-          ...prevState.refinementList,
-          authorRole: role
-        }
+        refinementList: { ...prevState.refinementList, authorRole: role }
       }
     })
   }

components/search/testimony/useTestimonyRefinements.tsx

@@ -1,20 +1,9 @@
 import { useRefinementListUiProps } from "@alexjball/react-instantsearch-hooks-web"
 import { useRefinements } from "../useRefinements"
-import { useCallback } from "react"
-import { RefinementListItem } from "instantsearch.js/es/connectors/refinement-list/connectRefinementList"
 
 export const useTestimonyRefinements = () => {
   const baseProps = { limit: 500, searchable: true }
   const propsList = [
-    useRefinementListUiProps({
-      transformItems: useCallback(
-        (i: RefinementListItem[]) => i.filter(i => i.label !== "private"),
-        []
-      ),
-      attribute: "authorDisplayName",
-      ...baseProps,
-      searchablePlaceholder: "Author Name"
-    }),
     useRefinementListUiProps({
       attribute: "court",
       ...baseProps,
@@ -30,6 +19,11 @@ export const useTestimonyRefinements = () => {
       ...baseProps,
       searchablePlaceholder: "Bill"
     }),
+    useRefinementListUiProps({
+      attribute: "authorDisplayName",
+      ...baseProps,
+      searchablePlaceholder: "Author Name"
+    }),
     useRefinementListUiProps({
       attribute: "authorRole",
       ...baseProps,

functions/src/auth/createFakeTestimony.ts

@@ -42,9 +42,7 @@ export const createFakeTestimony = functions.https.onCall(
       court: 192,
       position: "oppose",
       fullName: fullName,
-      content: fullName + " " + fullName + " " + fullName + " " + fullName,
-      public: true,
-      updatedAt: Timestamp.now()
+      content: fullName + " " + fullName + " " + fullName + " " + fullName
     }
 
     const testRef = db.doc(`users/${uid}/publishedTestimony/${id}`)

functions/src/testimony/publishTestimony.ts

@@ -48,7 +48,6 @@ type PublishInfo = {
   version: number
   editReason?: string
   publishedAt: Timestamp
-  updatedAt: Timestamp
 }
 
 class PublishTestimonyTransaction {
@@ -92,8 +91,7 @@ class PublishTestimonyTransaction {
       ...publishInfo,
       attachmentId: this.attachments.id,
       draftAttachmentId: this.attachments.draftId,
-      fullName: this.profile?.fullName ?? "Anonymous",
-      public: this.profile?.public ?? true
+      fullName: this.profile?.fullName ?? "Anonymous"
     }
     if (this.profile?.representative?.id) {
       newPublication.representativeId = this.profile.representative.id
@@ -220,11 +218,7 @@ class PublishTestimonyTransaction {
     const version = await this.getNextPublicationVersion(),
       reason = this.draft.editReason
 
-    const info: PublishInfo = {
-      version,
-      publishedAt: Timestamp.now(),
-      updatedAt: Timestamp.now()
-    }
+    const info: PublishInfo = { version, publishedAt: Timestamp.now() }
 
     if (version > 1) {
       if (!reason) throw fail("invalid-argument", "Edit reason is required.")
@@ -280,7 +274,7 @@ class PublishTestimonyTransaction {
   private getDisplayName(): string {
     // Check if user has profile and then if they're private
     if (this.profile) {
-      return this.profile.public ? this.profile.fullName : "private"
+      return this.profile.public ? this.profile.fullName : "<private user>"
     } else {
       return "Anonymous"
     }

functions/src/testimony/search.ts

@@ -19,11 +19,8 @@ export const {
       { name: "authorUid", type: "string", facet: false },
       { name: "authorRole", type: "string", facet: true },
       { name: "authorDisplayName", type: "string", facet: true },
-      { name: "fullName", type: "string", facet: false },
       { name: "version", type: "int32", facet: false },
-      { name: "public", type: "bool", facet: false },
-      { name: "publishedAt", type: "int64", facet: false },
-      { name: "updatedAt", type: "int64", facet: false }
+      { name: "publishedAt", type: "int64", facet: false }
     ],
     default_sorting_field: "publishedAt"
   },
@@ -45,9 +42,7 @@ export const {
       authorRole: testimony.authorRole,
       version: testimony.version,
       publishedAt: testimony.publishedAt.toMillis(),
-      updatedAt: testimony.updatedAt.toMillis(),
-      fullName: testimony.fullName,
-      public: testimony.public
+      fullName: testimony.fullName
     }
     return TestimonySearchRecord.check(record)
   }

functions/src/testimony/types.ts

@@ -1,5 +1,4 @@
 import {
-  Boolean,
   InstanceOf,
   Literal as L,
   Number,
@@ -36,9 +35,7 @@ export const Testimony = withDefaults(
     authorRole: Role,
     billTitle: RtString,
     version: Number,
-    public: Boolean,
     publishedAt: InstanceOf(Timestamp),
-    updatedAt: InstanceOf(Timestamp),
     representativeId: Optional(RtString),
     senatorId: Optional(RtString),
     senatorDistrict: Optional(RtString),
@@ -51,8 +48,6 @@ export const Testimony = withDefaults(
     // ID is backfilled
     id: "unknown",
     publishedAt: Timestamp.fromMillis(0),
-    updatedAt: Timestamp.fromMillis(0),
-    public: true,
     authorDisplayName: "Anonymous",
     fullName: "Anonymous",
     billTitle: ""
@@ -80,9 +75,7 @@ export const TestimonySearchRecord = R({
   authorRole: RtString,
   authorDisplayName: RtString,
   version: Number,
-  public: Boolean,
   publishedAt: Number,
-  updatedAt: Number,
   fullName: RtString
 })
 export type TestimonySearchRecord = Static<typeof TestimonySearchRecord>

scripts/firebase-admin/updateDisplayNames.ts

@@ -18,14 +18,13 @@ export const script: Script = async ({ db }) => {
         .then(result => result.docs)
 
       const fullName = data.fullName ?? "Anonymous"
-      const displayName = data.public ? fullName : "private"
+      const displayName = data.public ? fullName : "<private user>"
 
       for (const doc of publishedTestimony) {
         writer.update(doc.ref, {
           authorDisplayName: displayName,
           fullName: fullName,
-          updatedAt: Timestamp.now(),
-          public: data.public ?? false
+          updatedAt: Timestamp.now()
         })
       }
     } catch (error) {

stories_hold/organisms/profile/UserTestimonyListCard.stories.tsx

@@ -66,10 +66,8 @@ Primary.args = {
     billTitle: "Bill Title",
     version: 1.0,
     publishedAt: Timestamp.fromDate(new Date("2022-01-01T00:00:00.000Z")),
-    updatedAt: Timestamp.fromDate(new Date("2022-01-01T00:00:00.000Z")),
     draftAttachmentId: "attachment123",
-    fullName: "",
-    public: true
+    fullName: ""
   },
   isUser: true,
   canEdit: true,

tests/integration/common.ts

@@ -176,11 +176,9 @@ export const createNewTestimony = async (uid: string, billId: string) => {
     version: 2,
     billId,
     publishedAt: testTimestamp.now(),
-    updatedAt: testTimestamp.now(),
     court: 192,
     position: "oppose",
-    content: "testimony content",
-    public: true
+    content: "testimony content"
   }
 
   try {

tests/integration/moderation.test.ts

@@ -211,16 +211,14 @@ function createValidatedDraft(authorUid: string, billId: string) {
     id: "unknown",
     authorRole: "user",
     billTitle: "",
-    fullName: "Anonymous",
-    public: true,
-    updatedAt: Timestamp.fromMillis(0)
+    fullName: "Anonymous"
   }
 
   const validation = Testimony.validateWithDefaults(draft)
 
   expect(validation.success).toBeTruthy()
 
-  const { publishedAt, updatedAt, ...rest } = draft
+  const { publishedAt, ...rest } = draft
 
   return { draftId, draft: rest }
 }

tests/integration/testimony.test.ts

@@ -160,7 +160,7 @@ describe("publishTestimony", () => {
     expect(publication?.version).toBe(1)
     expect(publication.publishedAt).toBeDefined()
     expect(publication.authorUid).toEqual(user.uid)
-    expect([fullName, "Anonymous", "private"]).toContain(
+    expect([fullName, "Anonymous", "<private user>"]).toContain(
       publication.authorDisplayName
     )
     expect(publication).toMatchObject(draft)