Merge pull request #7754 from systeminit/jobelenus/users-not-finding-changeset

Onboarding users are not finding change sets when they're created by agent / MCP

Author: stack72

app/web/src/api/sdf/dal/change_set.ts

@@ -29,6 +29,7 @@ export interface ChangeSet {
   updatedAt?: IsoDateString;
   abandonRequestedAt?: IsoDateString;
   abandonRequestedByUserId?: UserId;
+  createdByUserId?: UserId;
 }
 
 export type ChangeStatus = "added" | "deleted" | "modified" | "unmodified";

app/web/src/newhotness/nav/ChangeSetPanel.vue

@@ -19,8 +19,11 @@
         :enableSecondaryAction="calculateShowSecondaryAction"
         :sizeClass="tw`h-[28px]`"
         secondaryActionIcon="edit2"
+        :hoverBorder="false"
+        :class="youHaveNewChangeSet && 'new-change-set-alert'"
         @select="onSelectChangeSet"
         @secondaryAction="openRenameModal"
+        @click="clearAnimation"
       >
         <template #afterOptions>
           <DropdownMenuItem
@@ -158,6 +161,27 @@ const ctx = useContext();
 
 const { openChangeSets, changeSet } = useChangeSets(computed(() => ctx));
 
+// when change set list updates with new data
+// are any of the new CS from me (or my AI agent?)
+const youHaveNewChangeSet = ref(false);
+watch([openChangeSets, ctx.changeSetId], ([newCS, _], [oldCS, _c]) => {
+  const myOld = new Set(
+    oldCS.filter((c) => c.createdByUserId === ctx.user?.pk).map((c) => c.id),
+  );
+  const myNew = new Set(
+    newCS.filter((c) => c.createdByUserId === ctx.user?.pk).map((c) => c.id),
+  );
+  const diff = [...myNew].filter((id) => !myOld.has(id));
+  if (diff.length > 1) youHaveNewChangeSet.value = true;
+  else if (diff.length === 0) youHaveNewChangeSet.value = false;
+  else if (diff[0] && diff[0] !== ctx.changeSetId.value)
+    youHaveNewChangeSet.value = true;
+});
+
+const clearAnimation = () => {
+  youHaveNewChangeSet.value = false;
+};
+
 const dropdownMenuRef = ref<InstanceType<typeof DropdownMenuButton>>();
 
 const changeSetDropdownOptions = computed(() => [
@@ -297,3 +321,60 @@ function openCreateModal() {
 
 defineExpose({ openCreateModal });
 </script>
+
+<style scoped>
+/* 
+  Taken right from the lobby with minimal alterations (jobelenus)
+  Note*(victor): These styles exist to power the spinning border on the lobby terminal */
+
+/*
+  We need to declare --angle as a property with an initial value so that keyframes can correctly interpolate it
+  If we don't, the keyframes below would only blip between the declared states
+ */
+@property --angle {
+  syntax: "<angle>";
+  inherits: false;
+  initial-value: 0deg;
+}
+@keyframes borderRotate {
+  100% {
+    --angle: 360deg;
+  }
+}
+
+@keyframes pulse {
+  0%,
+  35%,
+  70%,
+  100% {
+    background-color: #000;
+  }
+  50% {
+    background-color: rgba(134, 239, 172, 0.25); /* success-300 */
+  }
+}
+
+.new-change-set-alert {
+  border: 1px solid;
+  /*
+    use a spinning conic-gradient as the border image. It looks like this: https://www.geeksforgeeks.org/css/css-conic-gradient-function/
+    But "masked" through the border
+  */
+  border-image: conic-gradient(
+      from var(--angle),
+      #333,
+      #333 0.65turn,
+      #86efac 1turn /* success-300 */
+    )
+    1;
+  /*
+    Enable the animation. Although the rotation is linear, since it's showing through a rectangular shape,
+    both the moving speed and the trail length vary depending on the position. We could fudge the border speed by
+    compensating on the keyframes vs the "radius" of each border position but this wouldn't fix the trail so
+    we chose to use this as is.
+  */
+  animation: borderRotate 1500ms linear infinite forwards, pulse 5s infinite;
+  /* border-radius does not interact with border images, so this all black mask that takes the size of the div makes it round again */
+  mask-image: radial-gradient(#000 0, #000 0);
+}
+</style>

lib/dal/src/change_set.rs

@@ -275,6 +275,7 @@ pub struct ChangeSet {
     pub merge_requested_at: Option<DateTime<Utc>>,
     pub reviewed_by_user_id: Option<UserPk>,
     pub reviewed_at: Option<DateTime<Utc>>,
+    pub created_by_user_id: Option<UserPk>,
 }
 
 impl TryFrom<PgRow> for ChangeSet {
@@ -296,6 +297,7 @@ impl TryFrom<PgRow> for ChangeSet {
             merge_requested_at: value.try_get("merge_requested_at")?,
             reviewed_by_user_id: value.try_get("reviewed_by_user_id")?,
             reviewed_at: value.try_get("reviewed_at")?,
+            created_by_user_id: value.try_get("created_by_user_id")?,
         })
     }
 }
@@ -310,15 +312,19 @@ impl ChangeSet {
         let id: Ulid = Ulid::new();
         let change_set_id: ChangeSetId = id.into();
         let workspace_id = ctx.tenancy().workspace_pk_opt();
+        let user_id = match ctx.history_actor() {
+            HistoryActor::User(user_pk) => Some(user_pk),
+            _ => None,
+        };
 
         let name = name.as_ref();
         let row = ctx
             .txns()
             .await?
             .pg()
             .query_one(
-                "INSERT INTO change_set_pointers (id, name, base_change_set_id, status, workspace_id, workspace_snapshot_address) VALUES ($1, $2, $3, $4, $5, $6) RETURNING *",
-                &[&change_set_id, &name, &base_change_set_id, &ChangeSetStatus::Open.to_string(), &workspace_id, &workspace_snapshot_address],
+                "INSERT INTO change_set_pointers (id, name, base_change_set_id, status, workspace_id, workspace_snapshot_address, created_by_user_id) VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING *",
+                &[&change_set_id, &name, &base_change_set_id, &ChangeSetStatus::Open.to_string(), &workspace_id, &workspace_snapshot_address, &user_id],
             )
             .await?;
         let change_set = Self::try_from(row)?;
@@ -391,6 +397,7 @@ impl ChangeSet {
             reviewed_by_user_id: self.reviewed_by_user_id.map(|id| id.into()),
             reviewed_by_user,
             reviewed_at: self.reviewed_at,
+            created_by_user_id: self.created_by_user_id.map(|id| id.into()),
         };
 
         Ok(change_set)

lib/si-db/src/migrations/U4010__change_set_created_by.sql

@@ -0,0 +1 @@
+ALTER TABLE change_set_pointers ADD COLUMN created_by_user_id ident;

lib/si-frontend-types-rs/src/change_set.rs

@@ -36,6 +36,7 @@ pub struct ChangeSet {
     pub reviewed_by_user_id: Option<String>,
     pub reviewed_by_user: Option<String>,
     pub reviewed_at: Option<DateTime<Utc>>,
+    pub created_by_user_id: Option<String>,
 }
 
 #[derive(Deserialize, Serialize, Debug)]