storybook

mtojek · mtojek · commit 55d7ff1000e6 · 2023-09-11T13:39:14.000+02:00
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -1324,6 +1324,25 @@ func convertProvisionedApps(dbApps []database.WorkspaceApp) []codersdk.Workspace
 func convertApps(dbApps []database.WorkspaceApp, agent database.WorkspaceAgent, owner database.User, workspace database.Workspace) []codersdk.WorkspaceApp {
 	apps := make([]codersdk.WorkspaceApp, 0)
 	for _, dbApp := range dbApps {
+		/*
+		  let appSlug = app.slug;
+		  let appDisplayName = app.display_name;
+		  if (!appSlug) {
+		    appSlug = appDisplayName;
+		  }
+		  if (!appDisplayName) {
+		    appDisplayName = appSlug;
+		  }
+
+
+
+		  if (appsHost && app.subdomain) {
+		    const subdomain = `${appSlug}--${agent.name}--${workspace.name}--${username}`;
+		    href = `${window.location.protocol}//${appsHost}/`.replace("*", subdomain);
+		  }
+
+		*/
+
 		apps = append(apps, codersdk.WorkspaceApp{
 			ID:           dbApp.ID,
 			URL:          dbApp.Url.String,
diff --git a/site/src/components/Resources/AppLink/AppLink.stories.tsx b/site/src/components/Resources/AppLink/AppLink.stories.tsx
@@ -18,10 +18,13 @@ const meta: Meta<typeof AppLink> = {
       <ProxyContext.Provider
         value={{
           proxyLatencies: MockProxyLatencies,
-          proxy: getPreferredProxy(
-            MockWorkspaceProxies,
-            MockPrimaryWorkspaceProxy,
-          ),
+          proxy: {
+            ...getPreferredProxy(
+              MockWorkspaceProxies,
+              MockPrimaryWorkspaceProxy,
+            ),
+            preferredWildcardHostname: "*.super_proxy.tld",
+          },
           proxies: MockWorkspaceProxies,
           isLoading: false,
           isFetched: true,
@@ -135,3 +138,15 @@ export const HealthUnhealthy: Story = {
     agent: MockWorkspaceAgent,
   },
 };
+
+export const InternalApp: Story = {
+  args: {
+    workspace: MockWorkspace,
+    app: {
+      ...MockWorkspaceApp,
+      subdomain: true,
+      subdomain_name: "slug--agent_name--workspace_name--username",
+    },
+    agent: MockWorkspaceAgent,
+  },
+};
diff --git a/site/src/components/Resources/AppLink/AppLink.tsx b/site/src/components/Resources/AppLink/AppLink.tsx
@@ -51,9 +51,11 @@ export const AppLink: FC<AppLinkProps> = ({ app, workspace, agent }) => {
     }/terminal?command=${encodeURIComponent(app.command)}`;
   }
 
-  if (appsHost && app.subdomain) {
-    const subdomain = `${appSlug}--${agent.name}--${workspace.name}--${username}`;
-    href = `${window.location.protocol}//${appsHost}/`.replace("*", subdomain);
+  if (appsHost && app.subdomain && app.subdomain_name) {
+    href = `${window.location.protocol}//${appsHost}/`.replace(
+      "*",
+      app.subdomain_name,
+    );
   }
   if (app.external) {
     href = app.url;

Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,11 @@ export const AppLink: FC<AppLinkProps> = ({ app, workspace, agent }) => {`
`51`	`51`	}/terminal?command=${encodeURIComponent(app.command)}`;
`52`	`52`	`}`
`53`	`53`
`54`		`- if (appsHost && app.subdomain) {`
`55`		- const subdomain = `${appSlug}--${agent.name}--${workspace.name}--${username}`;
`56`		- href = `${window.location.protocol}//${appsHost}/`.replace("*", subdomain);
	`54`	`+ if (appsHost && app.subdomain && app.subdomain_name) {`
	`55`	+ href = `${window.location.protocol}//${appsHost}/`.replace(
	`56`	`+ "*",`
	`57`	`+ app.subdomain_name,`
	`58`	`+ );`
`57`	`59`	`}`
`58`	`60`	`if (app.external) {`
`59`	`61`	`href = app.url;`