Cs 10383 create listing and make a PR should have a loading user experience

packages/base/command.gts

@@ -386,10 +386,11 @@ export class ListingInstallResult extends CardDef {
 export class CreateListingPRRequestInput extends CardDef {
   @field realm = contains(RealmField);
   @field listingId = contains(StringField);
+  @field listingName = contains(StringField);
 }
 
 export class ListingCreateInput extends CardDef {
-  @field openCardId = contains(StringField);
+  @field openCardIds = containsMany(StringField);
   @field codeRef = contains(CodeRefField);
   @field targetRealm = contains(RealmField);
 }

packages/base/menu-items.ts

@@ -6,7 +6,7 @@ import {
 
 import CopyCardCommand from '@cardstack/boxel-host/commands/copy-card';
 import GenerateExampleCardsCommand from '@cardstack/boxel-host/commands/generate-example-cards';
-import ListingCreateCommand from '@cardstack/boxel-host/commands/listing-create';
+import OpenCreateListingModalCommand from '@cardstack/boxel-host/commands/open-create-listing-modal';
 import OpenInInteractModeCommand from '@cardstack/boxel-host/commands/open-in-interact-mode';
 import PopulateWithSampleDataCommand from '@cardstack/boxel-host/commands/populate-with-sample-data';
 import ShowCardCommand from '@cardstack/boxel-host/commands/show-card';
@@ -155,7 +155,7 @@ export function getDefaultCardMenuItems(
     });
     menuItems = [...menuItems, ...getSampleDataMenuItems(card, params)];
     menuItems.push({
-      label: `Create Listing with AI`,
+      label: `Create Listing`,
       action: async () => {
         const codeRef = resolveAdoptsFrom(card);
         if (!codeRef) {
@@ -165,9 +165,9 @@ export function getDefaultCardMenuItems(
         if (!targetRealm) {
           throw new Error('Unable to determine target realm from card');
         }
-        await new ListingCreateCommand(params.commandContext).execute({
-          openCardId: cardId,
+        await new OpenCreateListingModalCommand(params.commandContext).execute({
           codeRef,
+          openCardIds: [cardId],
           targetRealm,
         });
       },

packages/bot-runner/lib/github.ts

@@ -1,5 +1,5 @@
 const GITHUB_API_BASE = 'https://api.github.com';
-const GITHUB_TEAM_REVIEWERS = ['ecosystem-team', 'boxel-developers'];
+const GITHUB_TEAM_REVIEWERS = ['ecosystem-team'];
 
 export interface OpenPullRequestParams {
   owner: string;

packages/bot-runner/tests/command-runner-test.ts

@@ -9,6 +9,9 @@ import type {
 import type { GitHubClient } from '../lib/github';
 import { CommandRunner } from '../lib/command-runner';
 
+const SUBMISSION_REALM_URL = 'http://localhost:4201/submissions/';
+const SUBMISSION_BOT_USER_ID = '@submissionbot:localhost';
+
 module('command runner', () => {
   test('enqueues run-command job for matching trigger', async (assert) => {
     let publishedJobs: unknown[] = [];
@@ -65,7 +68,7 @@ module('command runner', () => {
     } as DBAdapter;
 
     let commandRunner = new CommandRunner(
-      '@submissionbot:localhost',
+      SUBMISSION_BOT_USER_ID,
       dbAdapter,
       queuePublisher,
       githubClient,
@@ -203,7 +206,7 @@ module('command runner', () => {
     } as DBAdapter;
 
     let commandRunner = new CommandRunner(
-      '@submissionbot:localhost',
+      SUBMISSION_BOT_USER_ID,
       dbAdapter,
       queuePublisher,
       githubClient,
@@ -234,12 +237,12 @@ module('command runner', () => {
     assert.deepEqual(
       (publishedJobs[1] as { args: Record<string, unknown> }).args,
       {
-        realmURL: 'http://localhost:4201/submissions/',
-        realmUsername: '@submissionbot:localhost',
-        runAs: '@submissionbot:localhost',
+        realmURL: SUBMISSION_REALM_URL,
+        realmUsername: SUBMISSION_BOT_USER_ID,
+        runAs: SUBMISSION_BOT_USER_ID,
         command: '@cardstack/catalog/commands/create-pr-card/default',
         commandInput: {
-          realm: 'http://localhost:4201/submissions/',
+          realm: SUBMISSION_REALM_URL,
           prNumber: 1,
           prUrl: 'https://example/pr/1',
           prTitle: 'Add My Listing Name listing',
@@ -351,7 +354,7 @@ module('command runner', () => {
     } as DBAdapter;
 
     let commandRunner = new CommandRunner(
-      '@submissionbot:localhost',
+      SUBMISSION_BOT_USER_ID,
       dbAdapter,
       queuePublisher,
       githubClient,
@@ -448,7 +451,7 @@ module('command runner', () => {
     } as DBAdapter;
 
     let commandRunner = new CommandRunner(
-      '@submissionbot:localhost',
+      SUBMISSION_BOT_USER_ID,
       dbAdapter,
       queuePublisher,
       githubClient,

packages/catalog-realm/catalog-app/listing/listing.gts

@@ -45,7 +45,7 @@ import { listingActions, isReady } from '../resources/listing-actions';
 import GetAllRealmMetasCommand from '@cardstack/boxel-host/commands/get-all-realm-metas';
 import ListingGenerateExampleCommand from '@cardstack/boxel-host/commands/listing-generate-example';
 import ListingUpdateSpecsCommand from '@cardstack/boxel-host/commands/listing-update-specs';
-import CreateListingPRRequestCommand from '@cardstack/boxel-host/commands/create-listing-pr-request';
+import OpenCreatePRModalCommand from '@cardstack/boxel-host/commands/open-create-pr-modal';
 
 import { getMenuItems } from '@cardstack/runtime-common';
 
@@ -564,6 +564,7 @@ class EmbeddedTemplate extends Component<typeof Listing> {
 export class Listing extends CardDef {
   static displayName = 'Listing';
   static headerColor = '#6638ff';
+  static isListingDef = true;
 
   @field name = contains(StringField);
   @field summary = contains(MarkdownField);
@@ -641,7 +642,7 @@ export class Listing extends CardDef {
   [getMenuItems](params: GetMenuItemParams): MenuItemOptions[] {
     let menuItems = super
       [getMenuItems](params)
-      .filter((item) => item.label?.toLowerCase() !== 'create listing with ai');
+      .filter((item) => item.label?.toLowerCase() !== 'create listing');
     if (params.menuContext === 'interact') {
       const extra = this.getGenerateExampleMenuItem(params);
       if (extra) {
@@ -676,9 +677,10 @@ export class Listing extends CardDef {
     return {
       label: 'Make a PR',
       action: async () => {
-        await new CreateListingPRRequestCommand(commandContext).execute({
+        await new OpenCreatePRModalCommand(commandContext).execute({
           listingId: this.id,
           realm: this[realmURL]!.href,
+          listingName: this.name,
         });
       },
       icon: Package,

packages/catalog-realm/commands/create-pr-card.ts

@@ -1,19 +1,11 @@
-import { Command, RealmPaths } from '@cardstack/runtime-common';
-import {
-  CardDef,
-  field,
-  contains,
-  type Theme,
-} from 'https://cardstack.com/base/card-api';
+import { Command } from '@cardstack/runtime-common';
+import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
 import MarkdownField from 'https://cardstack.com/base/markdown';
 import StringField from 'https://cardstack.com/base/string';
 import NumberField from 'https://cardstack.com/base/number';
-import GetCardCommand from '@cardstack/boxel-host/commands/get-card';
 import SaveCardCommand from '@cardstack/boxel-host/commands/save-card';
 import { PrCard } from '../pr-card/pr-card';
 
-const GITHUB_PR_THEME_PATH = 'Theme/github-pr-brand-guide';
-
 class CreatePrCardInput extends CardDef {
   @field realm = contains(StringField);
   @field prNumber = contains(NumberField);
@@ -44,7 +36,6 @@ export default class CreatePrCardCommand extends Command<
       prSummary,
       submittedBy,
     } = input;
-    let catalogRealmUrl = new RealmPaths(new URL('..', import.meta.url)).url;
 
     let card = new PrCard({
       prNumber,
@@ -56,15 +47,6 @@ export default class CreatePrCardCommand extends Command<
       submittedAt: new Date(),
     });
 
-    // Link the GitHub PR brand guide theme from the catalog realm
-    let themeCardId = `${catalogRealmUrl}${GITHUB_PR_THEME_PATH}`;
-    let theme = await new GetCardCommand(this.commandContext).execute({
-      cardId: themeCardId,
-    });
-    if (theme) {
-      card.cardInfo.theme = theme as Theme;
-    }
-
     // Save the PR card to the submission realm
     let savedCard = (await new SaveCardCommand(this.commandContext).execute({
       card,

packages/catalog-realm/submission-card/components/card/isolated-template.gts

@@ -47,6 +47,10 @@ export class IsolatedTemplate extends Component<typeof SubmissionCard> {
     return this.args.model.roomId;
   }
 
+  get prNumber() {
+    return this.args.model.prCard?.prNumber;
+  }
+
   get listingImage() {
     return this.args.model.listing?.images?.[0];
   }
@@ -166,7 +170,12 @@ export class IsolatedTemplate extends Component<typeof SubmissionCard> {
                 aria-label='View PR card'
                 {{on 'click' this.openPrCard}}
               >
-                <GitPullRequestIcon width='14' height='14' />View PR
+                <GitPullRequestIcon width='14' height='14' />
+                {{#if this.prNumber}}
+                  View PR #{{this.prNumber}}
+                {{else}}
+                  View PR
+                {{/if}}
               </BoxelButton>
             {{/if}}
           </div>
@@ -453,4 +462,3 @@ export class IsolatedTemplate extends Component<typeof SubmissionCard> {
     </style>
   </template>
 }
-

packages/host/app/commands/index.ts

@@ -37,6 +37,8 @@ import * as ListingUpdateSpecsCommandModule from './listing-update-specs';
 import * as ListingUseCommandModule from './listing-use';
 import * as OneShotLlmRequestCommandModule from './one-shot-llm-request';
 import * as OpenAiAssistantRoomCommandModule from './open-ai-assistant-room';
+import * as OpenCreateListingModalCommandModule from './open-create-listing-modal';
+import * as OpenCreatePRModalCommandModule from './open-create-pr-modal';
 import * as OpenInInteractModeModule from './open-in-interact-mode';
 import * as OpenWorkspaceCommandModule from './open-workspace';
 import * as PatchCardInstanceCommandModule from './patch-card-instance';
@@ -256,6 +258,14 @@ export function shimHostCommands(virtualNetwork: VirtualNetwork) {
     '@cardstack/boxel-host/commands/open-ai-assistant-room',
     OpenAiAssistantRoomCommandModule,
   );
+  virtualNetwork.shimModule(
+    '@cardstack/boxel-host/commands/open-create-listing-modal',
+    OpenCreateListingModalCommandModule,
+  );
+  virtualNetwork.shimModule(
+    '@cardstack/boxel-host/commands/open-create-pr-modal',
+    OpenCreatePRModalCommandModule,
+  );
   virtualNetwork.shimModule(
     '@cardstack/boxel-host/commands/open-workspace',
     OpenWorkspaceCommandModule,
@@ -404,6 +414,8 @@ export const HostCommandClasses: (typeof HostBaseCommand<any, any>)[] = [
   ListingUseCommandModule.default,
   OneShotLlmRequestCommandModule.default,
   OpenAiAssistantRoomCommandModule.default,
+  OpenCreateListingModalCommandModule.default,
+  OpenCreatePRModalCommandModule.default,
   OpenInInteractModeModule.default,
   OpenWorkspaceCommandModule.default,
   GenerateThemeExampleCommandModule.default,