Merge branch 'main' into fix-priority-field

Author: tintinthong

README.md

@@ -134,13 +134,13 @@ psql -h localhost -p 5435 -U postgres
 
 When the realm server starts up it will automatically run DB migrations that live in the `packages/realm-server/migrations` folder. As part of development you may wish to run migrations manually as well as to create a new migration.
 
-To create a new migration, from `packages/realm-server`, execute:
+To create a new migration, from `packages/postgres`, execute:
 
 ```
 pnpm migrate create name-of-migration
 ```
 
-This creates a new migration file in `packages/realm-server/migrations`. You can then edit the newly created migration file with the details of your migration. We use `node-pg-migrate` to handle our migrations. You can find the API at https://salsita.github.io/node-pg-migrate.
+This creates a new migration file in `packages/postgres/migrations`. You can then edit the newly created migration file with the details of your migration. We use `node-pg-migrate` to handle our migrations. You can find the API at https://salsita.github.io/node-pg-migrate.
 
 To run the migration, execute:
 
@@ -154,7 +154,7 @@ To revert the migration, execute:
 pnpm migrate down
 ```
 
-Boxel also uses SQLite in order to run the DB in the browser as part of running browser tests (and eventually we may run the realm server in the browser to provide a local index). We treat the Postgres database schema as the source of truth and derive the SQLite schema from it. Therefore, once you author and apply a migration, you should generate a new schema SQL file for SQLite. To generate a new SQLite schema, from `packages/realm-server`, execute:
+Boxel also uses SQLite in order to run the DB in the browser as part of running browser tests (and eventually we may run the realm server in the browser to provide a local index). We treat the Postgres database schema as the source of truth and derive the SQLite schema from it. Therefore, once you author and apply a migration, you should generate a new schema SQL file for SQLite. To generate a new SQLite schema, from `packages/postgres`, execute:
 
 ```
 pnpm make-schema

packages/billing/stripe-webhook-handlers/checkout-session-completed.ts

@@ -1,8 +1,9 @@
-import { type DBAdapter } from '@cardstack/runtime-common';
+import { decodeWebSafeBase64, type DBAdapter } from '@cardstack/runtime-common';
 import {
   addToCreditsLedger,
   getCurrentActiveSubscription,
   getMostRecentSubscriptionCycle,
+  getUserByMatrixUserId,
   getUserByStripeId,
   insertStripeEvent,
   markStripeEventAsProcessed,
@@ -28,23 +29,31 @@ export async function handleCheckoutSessionCompleted(
   await txManager.withTransaction(async () => {
     await insertStripeEvent(dbAdapter, event);
 
-    const stripeCustomerId = event.data.object.customer;
-    const matrixUserName = event.data.object.client_reference_id;
+    let stripeCustomerId = event.data.object.customer;
+    let encodedMatrixId = event.data.object.client_reference_id;
+    let matrixUserId = decodeWebSafeBase64(encodedMatrixId);
 
-    if (matrixUserName) {
-      // The matrix user id was encoded to be alphanumeric by replacing + with - and / with _
-      // Now we need to reverse that encoding to get back the original base64 string
-      const base64MatrixUserId = matrixUserName
-        .replace(/-/g, '+')
-        .replace(/_/g, '/');
-      const matrixUserId = Buffer.from(base64MatrixUserId, 'base64').toString(
-        'utf8',
+    if (!matrixUserId) {
+      throw new Error(
+        'No matrix user id found in checkout session completed event - this should be populated using client_reference_id query param in the payment link',
       );
+    }
+
+    // Stripe customer id will be present when user is subscribing to the free plan, but not when they are adding extra credits
+    if (stripeCustomerId) {
       await updateUserStripeCustomerId(
         dbAdapter,
         matrixUserId,
         stripeCustomerId,
       );
+    } else {
+      let user = await getUserByMatrixUserId(dbAdapter, matrixUserId);
+
+      if (!user) {
+        throw new Error(`User not found for matrix user id: ${matrixUserId}`);
+      }
+
+      stripeCustomerId = user.stripeCustomerId;
     }
 
     let creditReloadAmount =

packages/billing/stripe-webhook-handlers/index.ts

@@ -79,7 +79,7 @@ export type StripeCheckoutSessionCompletedWebhookEvent = StripeEvent & {
       id: string;
       object: 'checkout.session';
       client_reference_id: string;
-      customer: string;
+      customer: string | null; // string when payment link is for subscribing to the free plan, null when buying extra credits
       metadata:
         | {
             credit_reload_amount: string;

packages/boxel-ui/addon/src/components/avatar/index.gts

@@ -1,3 +1,4 @@
+import { htmlSafe } from '@ember/template';
 import Component from '@glimmer/component';
 
 import { getContrastColor } from '../../helpers/contrast-color.ts';
@@ -8,32 +9,49 @@ interface Signature {
   Args: {
     displayName?: string;
     isReady: boolean;
+    thumbnailURL?: string;
     userId: string;
   };
   Element: HTMLDivElement;
 }
 
+const setBackgroundImage = (backgroundURL: string | null | undefined) => {
+  if (!backgroundURL) {
+    return;
+  }
+  return htmlSafe(`background-image: url(${backgroundURL});`);
+};
+
 export default class Avatar extends Component<Signature> {
   <template>
     {{#let (deterministicColorFromString @userId) as |bgColor|}}
       <div
         class='profile-icon'
-        style={{cssVar
-          profile-avatar-icon-background=bgColor
-          profile-avatar-text-color=(getContrastColor bgColor)
+        style={{if
+          @thumbnailURL
+          (setBackgroundImage @thumbnailURL)
+          (cssVar
+            profile-avatar-icon-background=bgColor
+            profile-avatar-text-color=(getContrastColor bgColor)
+          )
         }}
         data-test-profile-icon={{@isReady}}
         data-test-profile-icon-userId={{@userId}}
+        role={{if @thumbnailURL 'img' 'presentation'}}
         aria-label={{if @displayName @displayName @userId}}
         ...attributes
       >
-        {{this.profileInitials}}
+        {{#unless @thumbnailURL}}
+          {{this.profileInitials}}
+        {{/unless}}
       </div>
     {{/let}}
     <style scoped>
       .profile-icon {
         --icon-size: var(--profile-avatar-icon-size, 40px);
         background: var(--profile-avatar-icon-background, var(--boxel-dark));
+        background-position: center;
+        background-size: cover;
         border-radius: 50%;
         border: var(--profile-avatar-icon-border, 2px solid white);
         display: inline-flex;

packages/boxel-ui/addon/src/components/avatar/usage.gts

@@ -13,6 +13,8 @@ import Avatar from './index.gts';
 export default class AvatarUsage extends Component {
   @tracked userId = 'user123';
   @tracked displayName = 'John Doe';
+  @tracked thumbnailURL =
+    'https://images.pexels.com/photos/4571943/pexels-photo-4571943.jpeg?auto=compress&cs=tinysrgb&w=300&h=300&dpr=1';
   @tracked isReady = true;
 
   @cssVariable({ cssClassName: 'avatar-freestyle-container' })
@@ -39,6 +41,7 @@ export default class AvatarUsage extends Component {
           <Avatar
             @userId={{this.userId}}
             @displayName={{this.displayName}}
+            @thumbnailURL={{this.thumbnailURL}}
             @isReady={{this.isReady}}
           />
         </:example>
@@ -57,6 +60,12 @@ export default class AvatarUsage extends Component {
             @value={{this.displayName}}
             @onInput={{fn (mut this.displayName)}}
           />
+          <Args.String
+            @name='thumbnailURL'
+            @description='URL of the user thumbnail'
+            @value={{this.thumbnailURL}}
+            @onInput={{fn (mut this.thumbnailURL)}}
+          />
           <Args.Bool
             @name='isReady'
             @required={{true}}

packages/boxel-ui/addon/src/helpers/deterministic-color-from-string.ts

@@ -9,7 +9,7 @@ import {
 // Selects a random color from a set of colors based on the input string
 export function deterministicColorFromString(str: string): string {
   if (!str) {
-    return 'transparent';
+    return '#EEEEEE';
   }
 
   // Generate hash value between 0-1

packages/experiments-realm/Company/141f3e15-cfd5-4b61-bd4c-37ea31dbeeab.json

@@ -0,0 +1,32 @@
+{
+  "data": {
+    "type": "card",
+    "attributes": {
+      "name": "Cardstack Studio Malaysia",
+      "industry": "Computer Programming",
+      "headquartersAddress": {
+        "addressLine1": "Lot 3A-01A, Level 3A",
+        "addressLine2": " Glo Damansara Shopping Mall",
+        "city": "Kuala Lumpur",
+        "state": null,
+        "postalCode": "60000",
+        "country": {
+          "name": "Malaysia",
+          "code": "MY"
+        },
+        "poBoxNumber": null
+      },
+      "phone": 60102345234,
+      "website": "https://cardstack.com/",
+      "stockSymbol": null,
+      "description": null,
+      "thumbnailURL": null
+    },
+    "meta": {
+      "adoptsFrom": {
+        "module": "../crm/company",
+        "name": "Company"
+      }
+    }
+  }
+}

packages/experiments-realm/Company/9203c173-3420-44b3-863d-90defd7c57c8.json

@@ -0,0 +1,32 @@
+{
+  "data": {
+    "type": "card",
+    "attributes": {
+      "name": "Innovative Tech Solutions",
+      "industry": "Technology",
+      "headquartersAddress": {
+        "addressLine1": "123 Innovation Drive",
+        "addressLine2": "Suite 400",
+        "city": "San Francisco",
+        "state": "California",
+        "postalCode": "94105",
+        "country": {
+          "name": "United States",
+          "code": "US"
+        },
+        "poBoxNumber": null
+      },
+      "phone": "+14155552671",
+      "website": "https://innovativetechsolutions.com/",
+      "stockSymbol": "ITS",
+      "description": "A leading provider of cutting-edge AI and cloud solutions for enterprises worldwide.",
+      "thumbnailURL": null
+    },
+    "meta": {
+      "adoptsFrom": {
+        "module": "../crm/company",
+        "name": "Company"
+      }
+    }
+  }
+}

packages/experiments-realm/Company/e1856419-27b0-4ce3-98fe-759d21c7144f.json

@@ -0,0 +1,32 @@
+{
+  "data": {
+    "type": "card",
+    "attributes": {
+      "name": "Tech Innovators Japan",
+      "industry": "Technology",
+      "headquartersAddress": {
+        "addressLine1": "2-1-1 Otemachi",
+        "addressLine2": "Chiyoda-ku",
+        "city": "Tokyo",
+        "state": null,
+        "postalCode": "100-0004",
+        "country": {
+          "name": "Japan",
+          "code": "JP"
+        },
+        "poBoxNumber": null
+      },
+      "phone": 81312345678,
+      "website": "https://techinnovators.jp/",
+      "stockSymbol": "",
+      "description": "",
+      "thumbnailURL": ""
+    },
+    "meta": {
+      "adoptsFrom": {
+        "module": "../crm/company",
+        "name": "Company"
+      }
+    }
+  }
+}

packages/experiments-realm/Map/20ad25ba-de18-40dc-979e-4603f62b5a2b.json

@@ -2,7 +2,18 @@
   "data": {
     "type": "card",
     "attributes": {
-      "address": "Livarska Ulica 10, Ljubljana, Slovenia",
+      "address": {
+        "addressLine1": "Livarska Ulica 10",
+        "addressLine2": null,
+        "city": null,
+        "state": null,
+        "postalCode": null,
+        "country": {
+          "name": "Slovenia",
+          "code": "SI"
+        },
+        "poBoxNumber": null
+      },
       "mapWidth": 600,
       "mapHeight": 400,
       "title": null,

packages/experiments-realm/Person/1.json

@@ -7,9 +7,9 @@
       "isCool": false,
       "isHuman": true,
       "address": {
-        "streetAddress": null,
+        "addressLine1": null,
         "city": null,
-        "region": null,
+        "state": null,
         "postalCode": null,
         "poBoxNumber": null,
         "country": null

packages/experiments-realm/TaskBase/c0bf3231-435c-4363-ad92-a1d756aea8d9.json

@@ -38,4 +38,4 @@
       }
     }
   }
-}
+}