feat: move proxy settings page to deployment options #8246

Emyrk · 2023-06-28T13:17:56Z

The Workspace proxy settings page was not showing any more information, so it was moved to the "Deployment" page only viewable by admins. More details can be shown there.

Closes #8153

Images

Regular user (member)

Admin

Notice the more accurate badges. Instead of just Healthy and Unhealthy. Not shown are the error messages that cause those errors. Need to figure out a way to include them with good styling.

Additional Changes

Typesgenerated: I added functionality for generic slices
ServerSide rendering: Return Region or WorkspaceProxy based on the user's perms

Future work

Each workspace proxy has 0 or more warnings and errors. We should show these, I just do not know the best way to style it 😢.

Workspace proxy settings page is now an admin feature

bpmct · 2023-06-28T14:14:37Z

Does this close #8153?

Emyrk · 2023-06-28T14:30:12Z

Does this close #8153?

Yes

Emyrk · 2023-06-29T12:31:47Z

cli/cliui/table.go

+		case "recursive_inline":
+			// recursive_inline is a helper to make recursive tables look nicer.
+			// It skips prefixing the parent name to the child name. If you do this,
+			// make sure the child name is unique across all nested structs in the parent.
+			recursiveOpt = true
+			skipParentNameOpt = true


I had to do this to make the table names nice. Otherwise it is like Proxy Region Url instead of just URL

Emyrk · 2023-06-29T12:36:17Z

site/src/pages/UserSettingsPage/WorkspaceProxyPage/WorkspaceProxyView.tsx

-                    onSelectRegion={onSelect}
-                    preferred={
-                      preferredProxy ? proxy.id === preferredProxy.id : false
-                    }


The deployment page removes the ability to select a proxy. That is all done in the dropdown now.

Emyrk · 2023-06-29T14:03:49Z

scripts/apitypings/testdata/genericmap/genericmap.ts

+// Code generated by 'make site/src/api/typesGenerated.ts'. DO NOT EDIT.
+
+// From codersdk/genericmap.go
+export interface Buzz {
+  readonly foo: Foo
+  readonly bazz: string
+}
+
+// From codersdk/genericmap.go
+export interface Foo {
+  readonly bar: string
+}
+
+// From codersdk/genericmap.go
+export interface FooBuzz<R extends Custom> {
+  readonly something: R[]
+}
+
+// From codersdk/genericmap.go
+export type Custom = Foo | Buzz


The typesgenerated addition just allows this.

Emyrk · 2023-06-29T14:04:10Z

scripts/apitypings/testdata/genericmap/genericmap.go

+// Not yet supported
+//type FooBuzzMap[R Custom] struct {
+//	Something map[string]R `json:"something"`
+//}
+
+// Not yet supported
+//type FooBuzzAnonymousUnion[R Foo | Buzz] struct {
+//	Something []R `json:"something"`
+//}


I might get to this later in another PR. I do not need this in this PR.

Emyrk · 2023-06-29T14:04:30Z

scripts/apitypings/main.go

-			return TypescriptType{ValueType: underlying.ValueType + "[]", AboveTypeLine: underlying.AboveTypeLine}, nil
+			var genValue = ""
+			if underlying.GenericValue != "" {
+				genValue = underlying.GenericValue + "[]"
+			}
+			return TypescriptType{
+				ValueType:     underlying.ValueType + "[]",
+				GenericValue:  genValue,
+				AboveTypeLine: underlying.AboveTypeLine,
+				GenericTypes:  underlying.GenericTypes,
+			}, nil


The only reason this did not exist is because we did not need it yet. It's a trivial addition.

…ge_move

bpmct

Can you add the description for workspace proxies in the dropdown? Users may not know what this region does (is it where I provision workspaces, is it my preferred DERP when I ssh, etc?)

Workspace proxies are used to reduce the latency of web-based connections to your workspaces.

Emyrk · 2023-06-29T17:32:52Z

Can you add the description for workspace proxies in the dropdown? Users may not know what this region does (is it where I provision workspaces, is it my preferred DERP when I ssh, etc?)

Workspace proxies are used to reduce the latency of web-based connections to your workspaces.

@bpmct I added that to this ticket: #8155

This PR has already grown a lot and I am stuck on how to style some dropdown additions.

…ge_move

Kira-Pilot · 2023-06-30T13:48:57Z

cli/cliui/table_test.go

+			},
+		}
+		out, err := cliui.DisplayTable(inlineIn, "", []string{"name", "age"})
+		log.Println("rendered table:\n" + out)


Is this log intentional?

Yes, it's helpful to build the expected output. Test logs only log in the error case by default (unless you do go test -v)

Kira-Pilot · 2023-06-30T14:00:37Z

site/src/components/DeploySettingsLayout/Badges.tsx

+  warnBadge: {
+    border: `1px solid ${theme.palette.warning.light}`,
+    backgroundColor: theme.palette.warning.dark,
+  },


Nice! We do now support writing styled components as opposed to classes, which we may want to lean into so we can get rid of makeStyles eventually. Not something that needs to be changed here - just a heads up.

Huh TIL. Will have to see some examples in the future.

https://github.com/coder/coder/blob/main/site/src/components/WorkspaceDeletion/ImpendingDeletionStat.tsx#L48

Kira-Pilot · 2023-06-30T14:22:10Z

site/src/contexts/ProxyContext.tsx

+  let query = async (): Promise<Region[]> => {
+    const resp = await getWorkspaceProxyRegions()
+    return resp.regions
+  }
+
+  if (permissions.editWorkspaceProxies) {
+    // Admins should query the more detailed endpoint.
+    query = async (): Promise<Region[]> => {
+      const resp = await getWorkspaceProxies()
+      return resp.regions
+    }
+  }


Suggested change

let query = async (): Promise<Region[]> => {

const resp = await getWorkspaceProxyRegions()

return resp.regions

}

if (permissions.editWorkspaceProxies) {

// Admins should query the more detailed endpoint.

query = async (): Promise<Region[]> => {

const resp = await getWorkspaceProxies()

return resp.regions

}

}

const query = async (): Promise<Region[]> => {

const endpoint = permissions.editWorkspaceProxies ? getWorkspaceProxies : getWorkspaceProxyRegions

const resp = await endpoint()

return resp.regions

}

There is always a smaller way 😄

Kira-Pilot

Pulled down - seems to be working smoothly!

Emyrk added 5 commits June 27, 2023 08:59

feat: Move workspace proxy page to deployment options

76fb28f

Workspace proxy settings page is now an admin feature

WorkspaceProxy response extends region

117f1b8

chore: Bad UI, but this does show all warnings/errors for a proxy

731e64d

add comment

918b7d1

Remove messages

ed2e564

github-actions bot assigned Emyrk Jun 28, 2023

Emyrk added 4 commits June 28, 2023 09:33

add recursive inline for anon embedded structs

c351a22

Revert column to url

2e1f196

make fmt/gen/lint

08db88a

Fix jest mock

5cbcbae

Emyrk added 2 commits June 28, 2023 10:26

workspace proxy mock

ee33895

Remove log

b7605d7

Emyrk added 2 commits June 28, 2023 10:55

WIP: progress indicator on latency refresh, keep menu open

0c05228

Remove excess

356554e

Emyrk requested review from BrunoQuaresma and Kira-Pilot and removed request for BrunoQuaresma and Kira-Pilot June 29, 2023 12:37

Emyrk added 2 commits June 29, 2023 09:23

Fix with server side loaded data

37ec7f6

Support generic slices in typesgenerated

ec7c755

Emyrk commented Jun 29, 2023

View reviewed changes

Emyrk added 7 commits June 29, 2023 10:08

Uniform region and proxy responses

bd3609a

Fetch privledged data if the user can

6c99694

Decide which response based on perms

4aecfbf

Merge remote-tracking branch 'origin/main' into stevenmasley/proxy_pa…

378344f

…ge_move

Formatting

fa9b6f5

Fix tests

bfd77c8

fixup! Fix tests

b3ce0d9

Emyrk added 2 commits June 29, 2023 11:30

Fix js mock rest endpoint

11163d2

Formatting

86ac8b3

bpmct reviewed Jun 29, 2023

View reviewed changes

Emyrk added 2 commits June 29, 2023 13:34

Fix JS mock rest response

680e8ab

Navbar now needs auth

21aac1b

Emyrk requested a review from Kira-Pilot June 29, 2023 18:42

Emyrk added 2 commits June 30, 2023 08:49

Merge remote-tracking branch 'origin/main' into stevenmasley/proxy_pa…

0a8fbc1

…ge_move

Merge remote-tracking branch 'origin/main' into stevenmasley/proxy_pa…

05ac587

…ge_move

Kira-Pilot reviewed Jun 30, 2023

View reviewed changes

Kira-Pilot approved these changes Jun 30, 2023

View reviewed changes

Emyrk added 2 commits June 30, 2023 10:34

Reduce LOC, pr feedback

7d421b9

Nil guard

f9786e3

Emyrk merged commit f0bd258 into main Jun 30, 2023

Emyrk deleted the stevenmasley/proxy_page_move branch June 30, 2023 15:32

github-actions bot locked and limited conversation to collaborators Jun 30, 2023

feat: move proxy settings page to deployment options #8246

feat: move proxy settings page to deployment options #8246

Uh oh!

Conversation

Emyrk commented Jun 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Images

Regular user (member)

Admin

Additional Changes

Future work

Uh oh!

bpmct commented Jun 28, 2023

Uh oh!

Emyrk commented Jun 28, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bpmct left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Emyrk commented Jun 29, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Kira-Pilot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Emyrk commented Jun 28, 2023 •

edited

Loading

bpmct left a comment •

edited

Loading