Moar merging

packages/frontend-2/components/project/page/settings/collaborators/Row.vue

@@ -124,7 +124,7 @@ const roleTooltip = computed(() => {
 })
 
 const isTargettingWorkspaceGuest = computed(
-  () => props.collaborator.role === Roles.Workspace.Guest
+  () => props.collaborator.workspaceRole === Roles.Workspace.Guest
 )
 
 const onActionChosen = (

packages/frontend/.vscode/settings.json

@@ -3,5 +3,6 @@
   "typescript.suggest.autoImports": true,
   "typescript.preferences.importModuleSpecifier": "non-relative",
   "javascript.preferences.importModuleSpecifier": "non-relative",
-  "volar.completion.preferredTagNameCase": "kebab"
+  "volar.completion.preferredTagNameCase": "kebab",
+  "vitest.disableWorkspaceWarning": true
 }

packages/preview-service/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "vitest.disableWorkspaceWarning": true
+}

packages/server/modules/activitystream/domain/operations.ts

@@ -9,8 +9,10 @@ import {
 } from '@/modules/activitystream/helpers/types'
 import {
   CommitCreateInput,
+  CommitUpdateInput,
   ProjectUpdateInput,
-  StreamUpdateInput
+  StreamUpdateInput,
+  UpdateVersionInput
 } from '@/modules/core/graph/generated/graphql'
 import {
   CommitRecord,
@@ -212,3 +214,12 @@ export type AddCommitCreatedActivity = (params: {
   modelId: string
   commit: CommitRecord
 }) => Promise<void>
+
+export type AddCommitUpdatedActivity = (params: {
+  commitId: string
+  streamId: string
+  userId: string
+  originalCommit: CommitRecord
+  update: CommitUpdateInput | UpdateVersionInput
+  newCommit: CommitRecord
+}) => Promise<void>

packages/server/modules/activitystream/services/commitActivity.ts

@@ -18,6 +18,7 @@ import { saveActivityFactory } from '@/modules/activitystream/repositories'
 import { db } from '@/db/knex'
 import {
   AddCommitCreatedActivity,
+  AddCommitUpdatedActivity,
   SaveActivity
 } from '@/modules/activitystream/domain/operations'
 
@@ -80,49 +81,57 @@ const isOldVersionUpdateInput = (
   i: CommitUpdateInput | UpdateVersionInput
 ): i is CommitUpdateInput => has(i, 'streamId')
 
-export async function addCommitUpdatedActivity(params: {
-  commitId: string
-  streamId: string
-  userId: string
-  originalCommit: CommitRecord
-  update: CommitUpdateInput | UpdateVersionInput
-  newCommit: CommitRecord
-}) {
-  const { commitId, streamId, userId, originalCommit, update, newCommit } = params
-  const legacyUpdateStruct: CommitUpdateInput = isOldVersionUpdateInput(update)
-    ? update
-    : {
-        id: update.versionId,
-        message: update.message,
-        streamId
-      }
+export const addCommitUpdatedActivityFactory =
+  ({
+    saveActivity,
+    publish
+  }: {
+    saveActivity: SaveActivity
+    publish: PublishSubscription
+  }): AddCommitUpdatedActivity =>
+  async (params: {
+    commitId: string
+    streamId: string
+    userId: string
+    originalCommit: CommitRecord
+    update: CommitUpdateInput | UpdateVersionInput
+    newCommit: CommitRecord
+  }) => {
+    const { commitId, streamId, userId, originalCommit, update, newCommit } = params
+    const legacyUpdateStruct: CommitUpdateInput = isOldVersionUpdateInput(update)
+      ? update
+      : {
+          id: update.versionId,
+          message: update.message,
+          streamId
+        }
 
-  await Promise.all([
-    saveActivityFactory({ db })({
-      streamId,
-      resourceType: ResourceTypes.Commit,
-      resourceId: commitId,
-      actionType: ActionTypes.Commit.Update,
-      userId,
-      info: { old: originalCommit, new: update },
-      message: `Commit updated: ${commitId}`
-    }),
-    pubsub.publish(CommitPubsubEvents.CommitUpdated, {
-      commitUpdated: { ...legacyUpdateStruct },
-      streamId,
-      commitId
-    }),
-    publish(ProjectSubscriptions.ProjectVersionsUpdated, {
-      projectId: streamId,
-      projectVersionsUpdated: {
-        id: commitId,
-        version: newCommit,
-        type: ProjectVersionsUpdatedMessageType.Updated,
-        modelId: null
-      }
-    })
-  ])
-}
+    await Promise.all([
+      saveActivity({
+        streamId,
+        resourceType: ResourceTypes.Commit,
+        resourceId: commitId,
+        actionType: ActionTypes.Commit.Update,
+        userId,
+        info: { old: originalCommit, new: update },
+        message: `Commit updated: ${commitId}`
+      }),
+      publish(CommitPubsubEvents.CommitUpdated, {
+        commitUpdated: { ...legacyUpdateStruct },
+        streamId,
+        commitId
+      }),
+      publish(ProjectSubscriptions.ProjectVersionsUpdated, {
+        projectId: streamId,
+        projectVersionsUpdated: {
+          id: commitId,
+          version: newCommit,
+          type: ProjectVersionsUpdatedMessageType.Updated,
+          modelId: null
+        }
+      })
+    ])
+  }
 
 export async function addCommitMovedActivity(params: {
   commitId: string

packages/server/modules/core/domain/streams/operations.ts

@@ -73,6 +73,17 @@ export type StoreStream = (
   }>
 ) => Promise<Stream>
 
+export type SetStreamFavorited = (params: {
+  streamId: string
+  userId: string
+  favorited?: boolean
+}) => Promise<void>
+
+export type CanUserFavoriteStream = (params: {
+  userId: string
+  streamId: string
+}) => Promise<boolean>
+
 export type DeleteStreamRecords = (streamId: string) => Promise<number>
 
 export type GetOnboardingBaseStream = (version: string) => Promise<Optional<Stream>>
@@ -224,3 +235,10 @@ export type GetFavoriteStreamsCollection = (params: {
   cursor?: string | null | undefined
   streamIdWhitelist?: string[] | undefined
 }) => Promise<{ totalCount: number; cursor: Nullable<string>; items: Stream[] }>
+
+export type FavoriteStream = (params: {
+  userId: string
+  streamId: string
+  favorited?: boolean | undefined
+  userResourceAccessRules?: ContextResourceAccessRules
+}) => Promise<Stream>

packages/server/modules/core/graph/resolvers/commits.js

@@ -67,9 +67,9 @@ const {
 } = require('@/modules/core/repositories/branches')
 const {
   addCommitDeletedActivity,
-  addCommitUpdatedActivity,
   addCommitMovedActivity,
-  addCommitCreatedActivityFactory
+  addCommitCreatedActivityFactory,
+  addCommitUpdatedActivityFactory
 } = require('@/modules/activitystream/services/commitActivity')
 const { VersionsEmitter } = require('@/modules/core/events/versionsEmitter')
 const { getObjectFactory } = require('@/modules/core/repositories/objects')
@@ -124,7 +124,10 @@ const updateCommitAndNotify = updateCommitAndNotifyFactory({
   getCommitBranch: getCommitBranchFactory({ db }),
   switchCommitBranch: switchCommitBranchFactory({ db }),
   updateCommit: updateCommitFactory({ db }),
-  addCommitUpdatedActivity,
+  addCommitUpdatedActivity: addCommitUpdatedActivityFactory({
+    saveActivity: saveActivityFactory({ db }),
+    publish
+  }),
   markCommitStreamUpdated,
   markCommitBranchUpdated: markCommitBranchUpdatedFactory({ db })
 })

packages/server/modules/core/graph/resolvers/streams.ts

@@ -1,6 +1,5 @@
 import {
   getStreamUsers,
-  favoriteStream,
   getActiveUserStreamFavoriteDate,
   getStreamFavoritesCount,
   getOwnedFavoritesCount
@@ -35,7 +34,9 @@ import {
   legacyGetStreamsFactory,
   getFavoritedStreamsCountFactory,
   getFavoritedStreamsPageFactory,
-  getStreamCollaboratorsFactory
+  getStreamCollaboratorsFactory,
+  canUserFavoriteStreamFactory,
+  setStreamFavoritedFactory
 } from '@/modules/core/repositories/streams'
 import {
   createStreamReturnRecordFactory,
@@ -87,7 +88,10 @@ import {
   validateStreamAccessFactory
 } from '@/modules/core/services/streams/access'
 import { getDiscoverableStreamsFactory } from '@/modules/core/services/streams/discoverableStreams'
-import { getFavoriteStreamsCollectionFactory } from '@/modules/core/services/streams/favorite'
+import {
+  favoriteStreamFactory,
+  getFavoriteStreamsCollectionFactory
+} from '@/modules/core/services/streams/favorite'
 
 const getFavoriteStreamsCollection = getFavoriteStreamsCollectionFactory({
   getFavoritedStreamsCount: getFavoritedStreamsCountFactory({ db }),
@@ -173,6 +177,11 @@ const getDiscoverableStreams = getDiscoverableStreamsFactory({
   countDiscoverableStreams: countDiscoverableStreamsFactory({ db })
 })
 const getStreams = legacyGetStreamsFactory({ db })
+const favoriteStream = favoriteStreamFactory({
+  canUserFavoriteStream: canUserFavoriteStreamFactory({ db }),
+  setStreamFavorited: setStreamFavoritedFactory({ db }),
+  getStream
+})
 
 const getUserStreamsCore = async (
   forOtherUser: boolean,

packages/server/modules/core/graph/resolvers/versions.ts

@@ -50,7 +50,7 @@ import { VersionsEmitter } from '@/modules/core/events/versionsEmitter'
 import {
   addCommitCreatedActivityFactory,
   addCommitMovedActivity,
-  addCommitUpdatedActivity
+  addCommitUpdatedActivityFactory
 } from '@/modules/activitystream/services/commitActivity'
 import { getObjectFactory } from '@/modules/core/repositories/objects'
 import { saveActivityFactory } from '@/modules/activitystream/repositories'
@@ -82,7 +82,10 @@ const updateCommitAndNotify = updateCommitAndNotifyFactory({
   getCommitBranch: getCommitBranchFactory({ db }),
   switchCommitBranch: switchCommitBranchFactory({ db }),
   updateCommit: updateCommitFactory({ db }),
-  addCommitUpdatedActivity,
+  addCommitUpdatedActivity: addCommitUpdatedActivityFactory({
+    saveActivity: saveActivityFactory({ db }),
+    publish
+  }),
   markCommitStreamUpdated,
   markCommitBranchUpdated: markCommitBranchUpdatedFactory({ db })
 })