feat: Add tracking to the UserInformation component (#1337)

* feat: Add tracking to the UserInformation component * feat: Upgrade decentraland-gatsby package * fix: Remove uuid usage * feat: Remove @types/uuid package --------- Co-authored-by: Gabriel Diaz <[email protected]>
decentraland · Oct 16, 2023 · aa2e709 · aa2e709
1 parent 89f2fdd
commit aa2e709
Show file tree

Hide file tree

Showing 10 changed files with 3,038 additions and 471 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -70,7 +70,7 @@
     "dayjs": "^1.11.9",
     "dayjs-precise-range": "^1.0.1",
     "dcl-catalyst-client": "^21.5.0",
-    "decentraland-gatsby": "^5.86.3",
+    "decentraland-gatsby": "^5.92.0",
     "decentraland-ui": "^4.1.0",
     "discord.js": "^14.7.1",
     "dompurify": "^2.3.3",

diff --git a/src/components/Layout/Navbar.tsx b/src/components/Layout/Navbar.tsx
@@ -1,12 +1,12 @@
 import { useLocation } from '@reach/router'
-import UserInformation, { UserInformationProps } from 'decentraland-gatsby/dist/components/User/UserInformation'
+import UserInformation from 'decentraland-gatsby/dist/components/User/UserInformation'
 import { Mobile, NotMobile } from 'decentraland-ui/dist/components/Media/Media'
 
 import BurgerMenu from './BurgerMenu/BurgerMenu'
 
 const BURGER_MENU_LOCATIONS = ['/', '/proposals/', '/transparency/', '/projects/', '/profile/']
 
-function Navbar(props: UserInformationProps) {
+function Navbar() {
   const location = useLocation()
   const showBurgerMenu = BURGER_MENU_LOCATIONS.some((burgerLocation) => burgerLocation === location.pathname)
 
@@ -18,7 +18,7 @@ function Navbar(props: UserInformationProps) {
         </Mobile>
       )}
       <NotMobile>
-        <UserInformation {...props} />
+        <UserInformation />
       </NotMobile>
     </>
   )

diff --git a/src/entities/Proposal/testHelpers.ts b/src/entities/Proposal/testHelpers.ts
@@ -1,6 +1,6 @@
 // eslint-disable @typescript-eslint/no-explicit-any
+import crypto from 'crypto'
 import JobContext from 'decentraland-gatsby/dist/entities/Job/context'
-import { v1 as uuid } from 'uuid'
 
 import Time from '../../utils/date/Time'
 import { Budget } from '../Budget/types'
@@ -103,7 +103,7 @@ export function createTestProposal(
   grantCategory?: NewGrantCategory
 ): ProposalAttributes {
   const testProposalConfiguration = getTestProposalConfiguration(proposalType, grantSize, grantCategory)
-  const id = uuid()
+  const id = crypto.randomUUID()
   return {
     ...BASIC_ATTRIBUTES,
     id: `id-${proposalType.toString()}-${proposalStatus.toString()}-${id}`,

diff --git a/src/entities/QuarterBudget/model.ts b/src/entities/QuarterBudget/model.ts
@@ -1,7 +1,7 @@
+import crypto from 'crypto'
 import { Model } from 'decentraland-gatsby/dist/entities/Database/model'
 import { SQL, table } from 'decentraland-gatsby/dist/entities/Database/utils'
 import snakeCase from 'lodash/snakeCase'
-import { v1 as uuid } from 'uuid'
 
 import { TransparencyBudget } from '../../clients/DclData'
 import Time from '../../utils/date/Time'
@@ -61,7 +61,7 @@ export default class QuarterBudgetModel extends Model<QuarterBudgetAttributes> {
 
   private static getNewQuarterBudget(transparencyBudget: TransparencyBudget, startAt: Date, finishAt: Date, now: Date) {
     const newQuarterBudget: QuarterBudgetAttributes = {
-      id: uuid(),
+      id: crypto.randomUUID(),
       total: transparencyBudget.total,
       start_at: startAt,
       finish_at: finishAt,

diff --git a/src/entities/Updates/model.test.ts b/src/entities/Updates/model.test.ts
@@ -1,5 +1,5 @@
 import { def } from 'bdd-lazy-var/getter'
-import * as uuid from 'uuid'
+import crypto from 'crypto'
 
 import Time from '../../utils/date/Time'
 import { getMonthsBetweenDates } from '../../utils/date/getMonthsBetweenDates'
@@ -8,8 +8,6 @@ import { VestingStartDate } from '../Grant/types'
 import UpdateModel from './model'
 import { UpdateStatus } from './types'
 
-jest.mock('uuid')
-
 const PROPOSAL_ID = '123'
 const UUID = '00000000-0000-0000-0000-000000000000'
 
@@ -20,7 +18,7 @@ describe('UpdateModel', () => {
     jest.clearAllMocks()
     jest.spyOn(UpdateModel, 'createMany').mockImplementation((list: any) => list)
     jest.spyOn(UpdateModel, 'delete').mockResolvedValue([] as any)
-    jest.spyOn(uuid, 'v1').mockReturnValue(UUID)
+    jest.spyOn(crypto, 'randomUUID').mockReturnValue(UUID)
     jest.useFakeTimers('modern')
     jest.setSystemTime(FAKE_NOW)
   })

diff --git a/src/entities/Updates/model.ts b/src/entities/Updates/model.ts
@@ -1,5 +1,5 @@
+import crypto from 'crypto'
 import { Model } from 'decentraland-gatsby/dist/entities/Database/model'
-import { v1 as uuid } from 'uuid'
 
 import { VestingDates } from '../../clients/VestingData'
 import Time from '../../utils/date/Time'
@@ -31,7 +31,7 @@ export default class UpdateModel extends Model<UpdateAttributes> {
 
     const updates = Array.from(Array(updatesQuantity), (_, index) => {
       const update: UpdateAttributes = {
-        id: uuid(),
+        id: crypto.randomUUID(),
         proposal_id: proposalId,
         status: UpdateStatus.Pending,
         due_date: this.getDueDate(firstUpdateStartingDate, index),
@@ -68,7 +68,7 @@ export default class UpdateModel extends Model<UpdateAttributes> {
     const now = new Date()
 
     return await this.create({
-      id: uuid(),
+      id: crypto.randomUUID(),
       status: UpdateStatus.Done,
       due_date: undefined,
       completion_date: now,

diff --git a/src/entities/Updates/utils.test.ts b/src/entities/Updates/utils.test.ts
@@ -1,4 +1,4 @@
-import { v1 as uuid } from 'uuid'
+import crypto from 'crypto'
 
 import Time from '../../utils/date/Time'
 
@@ -20,8 +20,8 @@ type GenerateUpdate = Pick<
   | 'completion_date'
 >
 const generateUpdate = (update: GenerateUpdate): UpdateAttributes => ({
-  id: uuid(),
-  proposal_id: uuid(),
+  id: crypto.randomUUID(),
+  proposal_id: crypto.randomUUID(),
   health: update.health,
   introduction: update.introduction,
   highlights: update.highlights,

diff --git a/src/services/BadgesService.ts b/src/services/BadgesService.ts
@@ -1,5 +1,5 @@
+import crypto from 'crypto'
 import logger from 'decentraland-gatsby/dist/entities/Development/logger'
-import { v1 as uuid } from 'uuid'
 
 import AirdropJobModel from '../back/models/AirdropJob'
 import { VoteService } from '../back/services/vote'
@@ -177,7 +177,7 @@ export class BadgesService {
   private static async queueAirdropJob(badgeSpec: string, recipients: string[]) {
     logger.log(`Enqueueing airdrop job`, { badgeSpec, recipients })
     try {
-      await AirdropJobModel.create({ id: uuid(), badge_spec: badgeSpec, recipients })
+      await AirdropJobModel.create({ id: crypto.randomUUID(), badge_spec: badgeSpec, recipients })
     } catch (error) {
       ErrorService.report('Unable to create AirdropJob', {
         error,

diff --git a/src/services/ProposalService.ts b/src/services/ProposalService.ts
@@ -1,6 +1,6 @@
+import crypto from 'crypto'
 import logger from 'decentraland-gatsby/dist/entities/Development/logger'
 import RequestError from 'decentraland-gatsby/dist/entities/Route/error'
-import { v1 as uuid } from 'uuid'
 
 import { VoteService } from '../back/services/vote'
 import { Discourse, DiscourseComment, DiscoursePost } from '../clients/Discourse'
@@ -44,7 +44,7 @@ export class ProposalService {
       throw new Error('Decentraland DAO Grants Program has been put on hold')
     }
 
-    const proposalId = uuid()
+    const proposalId = crypto.randomUUID()
     const proposalLifespan = this.getLifespan(proposalInCreation)
     const coAuthors = this.getCoAuthors(proposalInCreation)