Copilot V2 new default, rm Copilot V1 (#14729)

* Copilot V2 new default, rm Copilot V1

* Tidy up styles

Author: foot

assets/css/bundle.css

@@ -3139,19 +3139,15 @@ div.highlight.line-numbers pre.chroma code span.line::before{
   }
 }
 
-#ai-sidebar-host{
-  display:none
-}
-
-pulumi-copilot,#ai-sidebar-target{
+pulumi-copilot{
   position:fixed;
   z-index:10;
   top:108px;
   right:0;
   bottom:0
 }
 
-.section- #ai-sidebar-target,.section- pulumi-copilot{
+.section- pulumi-copilot{
   top:200px
 }
 

assets/js/bundle.js

@@ -8,9 +8,7 @@ security:
       - ASSET_BUNDLE_ID
       - PULUMI_CONVERT_URL
       - PULUMI_AI_WS_URL
-      - PULUMI_COPILOT_URL
       - PULUMI_ATLAS_URL
-      - DEV_PULUMI_COPILOT_BASE_PATH
       - GITHUB_TOKEN
       - ALGOLIA_APP_ID
       - ALGOLIA_APP_SEARCH_KEY

config/_default/config.yml

@@ -1,6 +1,4 @@
-{{ $copilotApiUrl := getenv "PULUMI_COPILOT_URL" }}
 {{ $atlasUrl := getenv "PULUMI_ATLAS_URL" }}
-{{ if or $copilotApiUrl $atlasUrl }}
-{{ $copilotBasePath := or (getenv "DEV_PULUMI_COPILOT_BASE_PATH") "/pulumi-ai/copilot" }}
-<copilot-sidebar copilot-src="{{ $copilotBasePath }}/sidebar?hostApp=docs&apiHost={{ $copilotApiUrl | urlquery }}" atlas-url="{{ $atlasUrl }}"></copilot-sidebar>
+{{ if $atlasUrl }}
+<copilot-sidebar atlas-url="{{ $atlasUrl }}"></copilot-sidebar>
 {{ end }}

layouts/partials/copilot/sidebar.html

@@ -10,10 +10,8 @@ export PULUMI_AI_WS_URL=${PULUMI_AI_WS_URL:-$(pulumi stack output --stack pulumi
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 INFRA_PATH="$SCRIPT_DIR/../infrastructure"
-# Read Copilot API URL from Pulumi config, ignoring any errors.
+# Read Copilot ("atlas") API URL from Pulumi config, ignoring any errors.
 # If the config value is not set Copilot will not be available.
-export PULUMI_COPILOT_URL=${PULUMI_COPILOT_URL:-$(pulumi --cwd "$INFRA_PATH" config get copilotUrl 2>/dev/null || echo "")}
-printf "Copilot URL: $PULUMI_COPILOT_URL\n"
 export PULUMI_ATLAS_URL=${PULUMI_ATLAS_URL:-$(pulumi --cwd "$INFRA_PATH" config get atlasUrl 2>/dev/null || echo "")}
 printf "Atlas URL: $PULUMI_ATLAS_URL\n"
 

scripts/build-site.sh

@@ -1,12 +1,4 @@
-// Host iframe
-// Should not be shown, when loaded it will portal the content to the sidebar target
-#ai-sidebar-host {
-    display: none
-}
-
-// Element that will be the target of the portal
-// If empty it will have a width of 0 and will not be visible.
-pulumi-copilot, #ai-sidebar-target {
+pulumi-copilot {
     // Relative to the viewport so copilot moves w/ the scrolling
     position: fixed;
 
@@ -26,7 +18,6 @@ pulumi-copilot, #ai-sidebar-target {
 // ---
 
 /* FIXME: no section suffix? */
-.section- #ai-sidebar-target,
 .section- pulumi-copilot {
     top: 200px;
 }

theme/src/scss/_copilot.scss

@@ -14,7 +14,6 @@ import { MultiSelectFormItem } from "./components/pulumi-multi-select-form/pulum
 export namespace Components {
     interface CopilotSidebar {
         "atlasUrl": string;
-        "copilotSrc": string;
     }
     interface EventSessionRegistrationModal {
         "buttonClass": string;
@@ -518,7 +517,6 @@ declare global {
 declare namespace LocalJSX {
     interface CopilotSidebar {
         "atlasUrl"?: string;
-        "copilotSrc"?: string;
     }
     interface EventSessionRegistrationModal {
         "buttonClass"?: string;

theme/stencil/src/components.d.ts

@@ -1,24 +1,15 @@
 import { Component, h, Host, Prop, State } from "@stencil/core";
-import { gb } from "../../util/util";
-
-const ATLAS_LOCAL_STORAGE_KEY = "pulumi-ai-use-atlas";
-
 
 @Component({
     tag: "copilot-sidebar",
     styleUrl: "copilot-sidebar.css",
     shadow: false,
 })
 export class CopilotSidebar {
-
     //
     // Props
     //
 
-    // The copilotSrc is URL where the copilot sidebar is hosted
-    @Prop()
-    copilotSrc: string;
-
     // The atlasUrl is the URL where the Atlas web component is hosted
     @Prop()
     atlasUrl: string;
@@ -27,26 +18,12 @@ export class CopilotSidebar {
     // Internal state
     //
 
-    // Whether to show the sidebar (growthbook flag)
-    @State()
-    showSidebar = false;
-
-    // Whether to show the Atlas web component (local storage flag)
-    @State()
-    showAtlas = false;
-
     // Whether the Atlas scripts have been loaded
     @State()
     atlasScriptsLoaded = false;
 
     async componentWillLoad() {
-        this.showSidebar = gb.isOn("copilot-on-docs");
-        gb.setRenderer(() => (this.showSidebar = gb.isOn("copilot-on-docs")));
-
-        this.showAtlas = this.atlasUrl && window.localStorage.getItem(ATLAS_LOCAL_STORAGE_KEY) !== "false";
-        if (this.showAtlas) {
-            await this.loadAtlasScripts();
-        }
+        await this.loadAtlasScripts();
     }
 
     private async loadAtlasScripts() {
@@ -80,26 +57,13 @@ export class CopilotSidebar {
     }
 
     render() {
-        if (this.showAtlas) {
-            if (!this.atlasScriptsLoaded) {
-                return <Host></Host>;
-            }
-
-            return (
-                <Host>
-                    <pulumi-copilot hostApp="docs" apiUrl={this.atlasUrl} />
-                </Host>
-            );
-        }
-
-        if (!this.showSidebar) {
+        if (!this.atlasScriptsLoaded) {
             return <Host></Host>;
         }
 
         return (
             <Host>
-                <aside id="ai-sidebar-target"></aside>
-                <iframe id="ai-sidebar-host" src={this.copilotSrc}></iframe>
+                <pulumi-copilot hostApp="docs" apiUrl={this.atlasUrl} />
             </Host>
         );
     }