Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commiteff7ae1

Browse files
committed
get those groups in that database
1 parent3a6d5f5 commiteff7ae1

File tree

15 files changed

+365
-323
lines changed

15 files changed

+365
-323
lines changed

‎cli/testdata/coder_provisioner_list_--output_json.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"last_seen_at": "====[timestamp]=====",
88
"name": "test-daemon",
99
"version": "v0.0.0-devel",
10-
"api_version": "1.6",
10+
"api_version": "1.7",
1111
"provisioners": [
1212
"echo"
1313
],

‎coderd/database/dump.sql

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
altertable workspace_apps drop column display_group;
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
altertable workspace_apps add column display_grouptext;

‎coderd/database/models.go

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

Lines changed: 14 additions & 6 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/queries/workspaceapps.sql

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,11 @@ INSERT INTO
3030
health,
3131
display_order,
3232
hidden,
33-
open_in
33+
open_in,
34+
display_group
3435
)
3536
VALUES
36-
($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18) RETURNING*;
37+
($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19) RETURNING*;
3738

3839
-- name: UpdateWorkspaceAppHealthByID :exec
3940
UPDATE

‎coderd/provisionerdserver/provisionerdserver.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2416,6 +2416,14 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
24162416
sharingLevel=database.AppSharingLevelPublic
24172417
}
24182418

2419+
displayGroup:= sql.NullString{}
2420+
ifapp.Group!="" {
2421+
displayGroup= sql.NullString{
2422+
Valid:true,
2423+
String:app.Group,
2424+
}
2425+
}
2426+
24192427
openIn:=database.WorkspaceAppOpenInSlimWindow
24202428
switchapp.OpenIn {
24212429
casesdkproto.AppOpenIn_TAB:
@@ -2448,6 +2456,7 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
24482456
Health:health,
24492457
// #nosec G115 - Order represents a display order value that's always small and fits in int32
24502458
DisplayOrder:int32(app.Order),
2459+
DisplayGroup:displayGroup,
24512460
Hidden:app.Hidden,
24522461
OpenIn:openIn,
24532462
})

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp