Merge branch 'main' into fix--do-not-update-position-each-time-we-upsert

Author: ijreilly

.yarn/patches/@wyw-in-js-transform-npm-0.7.0-ba641dc99f.patch

@@ -1,18 +1,18 @@
 {
   "private": true,
   "devDependencies": {
-    "@nx/jest": "22.5.4",
-    "@nx/js": "22.5.4",
-    "@nx/react": "22.5.4",
-    "@nx/storybook": "22.5.4",
-    "@nx/vite": "22.5.4",
-    "@nx/web": "22.5.4",
+    "@nx/jest": "22.7.5",
+    "@nx/js": "22.7.5",
+    "@nx/react": "22.7.5",
+    "@nx/storybook": "22.7.5",
+    "@nx/vite": "22.7.5",
+    "@nx/web": "22.7.5",
     "@types/react": "^18.2.39",
     "@types/react-dom": "^18.2.15",
     "@yarnpkg/types": "^4.0.0",
     "concurrently": "^8.2.2",
     "http-server": "^14.1.1",
-    "nx": "22.5.4",
+    "nx": "22.7.5",
     "oxfmt": "0.50.0",
     "tsx": "^4.17.0",
     "verdaccio": "^6.3.1"
@@ -33,8 +33,6 @@
     "graphql-redis-subscriptions/ioredis": "^5.6.0",
     "@lingui/core": "5.1.2",
     "@types/qs": "6.9.16",
-    "@wyw-in-js/transform@npm:0.6.0": "patch:@wyw-in-js/transform@npm%3A0.7.0#~/.yarn/patches/@wyw-in-js-transform-npm-0.7.0-ba641dc99f.patch",
-    "@wyw-in-js/transform@npm:0.7.0": "patch:@wyw-in-js/transform@npm%3A0.7.0#~/.yarn/patches/@wyw-in-js-transform-npm-0.7.0-ba641dc99f.patch",
     "@opentelemetry/api": "1.9.1",
     "chokidar": "^3.6.0",
     "tmp": "^0.2.7",
@@ -43,7 +41,9 @@
     "make-fetch-happen": "^15.0.0",
     "@electron/rebuild/tar": "npm:^7.5.16",
     "@electron/node-gyp/tar": "npm:^7.5.16",
-    "pacote/tar": "npm:^7.5.16"
+    "pacote/tar": "npm:^7.5.16",
+    "@angular-devkit/core": "19.2.24",
+    "yeoman-environment": "6.0.1"
   },
   "version": "0.2.1",
   "nx": {},

package.json

@@ -1,6 +1,6 @@
 {
   "name": "twenty-partners",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "license": "MIT",
   "engines": {
     "node": "^24.5.0",

packages/twenty-apps/internal/twenty-partners/package.json

@@ -5,9 +5,7 @@ export const DEFAULT_ROLE_UNIVERSAL_IDENTIFIER = 'ee18c3f3-ebe7-4c56-ad6d-aad555
 export const PARTNER_OBJECT_UNIVERSAL_IDENTIFIER = '39101b39-1c16-4148-9e82-45dc271bb90d';
 export const PARTNER_CONTENT_OBJECT_UNIVERSAL_IDENTIFIER = '65172140-d377-41c1-a2ae-190e96fb79dd';
 export const ALL_PARTNERS_VIEW_UNIVERSAL_IDENTIFIER = '379b11d5-44d5-476b-ba7d-31d5f515c9b4';
-export const ALL_MATCHED_DEALS_VIEW_UNIVERSAL_IDENTIFIER = '7a34da39-a8e1-44c7-88b4-91ceaa064920';
 export const PARTNERS_NAV_UNIVERSAL_IDENTIFIER = '3fe15ab5-e38b-4914-af17-2270b210aeb2';
-export const PARTNER_DEALS_NAV_UNIVERSAL_IDENTIFIER = 'c5e4ac36-bede-4f4b-bfe8-bbd09518abae';
 export const ON_OPP_AUTO_MATCH_FN_UNIVERSAL_IDENTIFIER = 'eb8d4d26-8103-4b66-9026-6a86556f7ca5';
 export const POST_INSTALL_FN_UNIVERSAL_IDENTIFIER = 'f92bad2e-5905-4757-96ee-af9869d4ca0c';
 export const ON_PARTNER_APPLICATION_CREATED_FN_UNIVERSAL_IDENTIFIER = '43888cce-a2aa-4100-afbc-59a4f978ce53';
@@ -18,13 +16,17 @@ export const INTRO_SENT_AT_FIELD_UNIVERSAL_IDENTIFIER = 'fcf39b0c-0547-415e-806d
 export const TWENTY_PARTNER_OPS_ROLE_UNIVERSAL_IDENTIFIER = '3340ca65-863d-4cdc-95c9-8abdec13d0f6';
 export const PARTNER_ROLE_UNIVERSAL_IDENTIFIER = 'c3c1dc2e-1a08-4de5-abb7-2139b3d99343';
 
-// Views (Task 3)
-export const WAITING_FOR_MATCH_VIEW_UNIVERSAL_IDENTIFIER = 'fe11e738-6bf3-4714-929c-51c76a3fd050';
-export const MATCHES_OVERVIEW_VIEW_UNIVERSAL_IDENTIFIER = '5a8fd51a-cf9e-4a6a-b1b4-b833b215fc1c';
-
-// Nav items (Task 5)
-export const WAITING_FOR_MATCH_NAV_UNIVERSAL_IDENTIFIER = '00be7449-8927-47c8-a6a1-212d9106587f';
-export const MATCHES_OVERVIEW_NAV_UNIVERSAL_IDENTIFIER = '0cf349c9-fcbf-40f8-8e91-142c02bbde9c';
+// Opportunity pipeline views + nav (simplified to partner presence; UIDs reused
+// from the previous matching views so they update in place rather than re-create).
+export const OPPORTUNITIES_NO_PARTNER_VIEW_UNIVERSAL_IDENTIFIER = 'fe11e738-6bf3-4714-929c-51c76a3fd050';
+// Fresh id (the old matches-overview id '5a8fd51a…' kept its stale KANBAN type +
+// view groups on re-sync; a new id forces a clean TABLE recreate).
+export const OPPORTUNITIES_WITH_PARTNER_VIEW_UNIVERSAL_IDENTIFIER = '053449b0-3d13-400d-afc2-6182a75b6dff';
+export const OPPORTUNITIES_NO_PARTNER_NAV_UNIVERSAL_IDENTIFIER = '00be7449-8927-47c8-a6a1-212d9106587f';
+export const OPPORTUNITIES_WITH_PARTNER_NAV_UNIVERSAL_IDENTIFIER = '0cf349c9-fcbf-40f8-8e91-142c02bbde9c';
+// Kanban board of with-partner opportunities, grouped by match status.
+export const OPPORTUNITIES_WITH_PARTNER_BOARD_VIEW_UNIVERSAL_IDENTIFIER = 'a426c594-513d-4252-808f-3cf26d5532b9';
+export const OPPORTUNITIES_WITH_PARTNER_BOARD_NAV_UNIVERSAL_IDENTIFIER = '3226b314-15e5-4182-89fe-b33d341f5684';
 
 // Page layout (Task 6)
 export const PARTNER_RECORD_PAGE_UNIVERSAL_IDENTIFIER = 'a888b39e-d64a-48ba-a044-d8cb685fad74';

packages/twenty-apps/internal/twenty-partners/src/constants/universal-identifiers.ts

@@ -7,6 +7,7 @@ export default defineField({
   type: FieldType.SELECT,
   name: 'matchStatus',
   label: 'Match Status',
+  icon: 'IconProgressCheck',
   isNullable: false,
   defaultValue: "'TO_BE_MATCHED'",
   options: [

packages/twenty-apps/internal/twenty-partners/src/fields/opportunity-match-status.field.ts

@@ -11,6 +11,7 @@ export default defineField({
   type: FieldType.RELATION,
   name: 'partner',
   label: 'Partner',
+  icon: 'IconBuildingStore',
   isNullable: true,
   relationTargetObjectMetadataUniversalIdentifier: PARTNER_OBJECT_UNIVERSAL_IDENTIFIER,
   relationTargetFieldMetadataUniversalIdentifier: OPPORTUNITIES_ON_PARTNER_FIELD_ID,

packages/twenty-apps/internal/twenty-partners/src/fields/partner-on-opportunity.field.ts

@@ -0,0 +1,15 @@
+import { NavigationMenuItemType, defineNavigationMenuItem } from 'twenty-sdk/define';
+
+import {
+  OPPORTUNITIES_WITH_PARTNER_BOARD_NAV_UNIVERSAL_IDENTIFIER,
+  OPPORTUNITIES_WITH_PARTNER_BOARD_VIEW_UNIVERSAL_IDENTIFIER,
+} from 'src/constants/universal-identifiers';
+
+export default defineNavigationMenuItem({
+  universalIdentifier: OPPORTUNITIES_WITH_PARTNER_BOARD_NAV_UNIVERSAL_IDENTIFIER,
+  type: NavigationMenuItemType.VIEW,
+  icon: 'IconLayoutKanban',
+  position: 2,
+  folderUniversalIdentifier: '0b2e499a-ae74-45e0-af08-243e19fc56aa',
+  viewUniversalIdentifier: OPPORTUNITIES_WITH_PARTNER_BOARD_VIEW_UNIVERSAL_IDENTIFIER,
+});

packages/twenty-apps/internal/twenty-partners/src/navigation-menu-items/opportunities-with-partner-board.navigation-menu-item.ts

@@ -1,15 +1,15 @@
 import { NavigationMenuItemType, defineNavigationMenuItem } from 'twenty-sdk/define';
 
 import {
-  MATCHES_OVERVIEW_NAV_UNIVERSAL_IDENTIFIER,
-  MATCHES_OVERVIEW_VIEW_UNIVERSAL_IDENTIFIER,
+  OPPORTUNITIES_WITH_PARTNER_NAV_UNIVERSAL_IDENTIFIER,
+  OPPORTUNITIES_WITH_PARTNER_VIEW_UNIVERSAL_IDENTIFIER,
 } from 'src/constants/universal-identifiers';
 
 export default defineNavigationMenuItem({
-  universalIdentifier: MATCHES_OVERVIEW_NAV_UNIVERSAL_IDENTIFIER,
+  universalIdentifier: OPPORTUNITIES_WITH_PARTNER_NAV_UNIVERSAL_IDENTIFIER,
   type: NavigationMenuItemType.VIEW,
-  icon: 'IconLayoutKanban',
+  icon: 'IconUserCheck',
   position: 1,
   folderUniversalIdentifier: '0b2e499a-ae74-45e0-af08-243e19fc56aa',
-  viewUniversalIdentifier: MATCHES_OVERVIEW_VIEW_UNIVERSAL_IDENTIFIER,
+  viewUniversalIdentifier: OPPORTUNITIES_WITH_PARTNER_VIEW_UNIVERSAL_IDENTIFIER,
 });

…matches-overview.navigation-menu-item.ts …ies-with-partner.navigation-menu-item.tspackages/twenty-apps/internal/twenty-partners/src/navigation-menu-items/matches-overview.navigation-menu-item.ts renamed to packages/twenty-apps/internal/twenty-partners/src/navigation-menu-items/opportunities-with-partner.navigation-menu-item.ts packages/twenty-apps/internal/twenty-partners/src/navigation-menu-items/matches-overview.navigation-menu-item.ts renamed to packages/twenty-apps/internal/twenty-partners/src/navigation-menu-items/opportunities-with-partner.navigation-menu-item.ts

@@ -1,15 +1,15 @@
 import { NavigationMenuItemType, defineNavigationMenuItem } from 'twenty-sdk/define';
 
 import {
-  WAITING_FOR_MATCH_NAV_UNIVERSAL_IDENTIFIER,
-  WAITING_FOR_MATCH_VIEW_UNIVERSAL_IDENTIFIER,
+  OPPORTUNITIES_NO_PARTNER_NAV_UNIVERSAL_IDENTIFIER,
+  OPPORTUNITIES_NO_PARTNER_VIEW_UNIVERSAL_IDENTIFIER,
 } from 'src/constants/universal-identifiers';
 
 export default defineNavigationMenuItem({
-  universalIdentifier: WAITING_FOR_MATCH_NAV_UNIVERSAL_IDENTIFIER,
+  universalIdentifier: OPPORTUNITIES_NO_PARTNER_NAV_UNIVERSAL_IDENTIFIER,
   type: NavigationMenuItemType.VIEW,
-  icon: 'IconClockHour4',
+  icon: 'IconUserOff',
   position: 0,
   folderUniversalIdentifier: '0b2e499a-ae74-45e0-af08-243e19fc56aa',
-  viewUniversalIdentifier: WAITING_FOR_MATCH_VIEW_UNIVERSAL_IDENTIFIER,
+  viewUniversalIdentifier: OPPORTUNITIES_NO_PARTNER_VIEW_UNIVERSAL_IDENTIFIER,
 });

…aiting-for-match.navigation-menu-item.ts …-without-partner.navigation-menu-item.tspackages/twenty-apps/internal/twenty-partners/src/navigation-menu-items/waiting-for-match.navigation-menu-item.ts renamed to packages/twenty-apps/internal/twenty-partners/src/navigation-menu-items/opportunities-without-partner.navigation-menu-item.ts packages/twenty-apps/internal/twenty-partners/src/navigation-menu-items/waiting-for-match.navigation-menu-item.ts renamed to packages/twenty-apps/internal/twenty-partners/src/navigation-menu-items/opportunities-without-partner.navigation-menu-item.ts

@@ -9,7 +9,7 @@ export default defineNavigationMenuItem({
   universalIdentifier: PARTNER_APPLICATIONS_NAV_UNIVERSAL_IDENTIFIER,
   type: NavigationMenuItemType.VIEW,
   icon: 'IconUserPlus',
-  position: 1,
+  position: 0,
   folderUniversalIdentifier: '857be3b5-82c6-45f7-b546-e20a8a97be8d',
   viewUniversalIdentifier: PARTNER_APPLICATIONS_VIEW_UNIVERSAL_IDENTIFIER,
 });