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

Commitbf4b351

Browse files
committed
fix: add branch for Shared value in aRequestOption
1 parentdd758d3 commitbf4b351

File tree

3 files changed

+21
-7
lines changed

3 files changed

+21
-7
lines changed

‎coderd/workspaces_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1844,7 +1844,7 @@ func TestWorkspaceFilter(t *testing.T) {
18441844
})
18451845

18461846
workspaces,err:=client.Workspaces(ctx, codersdk.WorkspaceFilter{
1847-
Shared:true,
1847+
Shared:codersdk.WorkspaceFilterShared,
18481848
})
18491849
require.NoError(t,err,"fetch workspaces")
18501850
require.Equal(t,1,workspaces.Count,"expected only one workspace")
@@ -1882,7 +1882,7 @@ func TestWorkspaceFilter(t *testing.T) {
18821882
})
18831883

18841884
workspaces,err:=client.Workspaces(ctx, codersdk.WorkspaceFilter{
1885-
Shared:false,
1885+
Shared:codersdk.WorkspaceFilterNotShared,
18861886
})
18871887
require.NoError(t,err,"fetch workspaces")
18881888
require.Equal(t,1,workspaces.Count,"expected only one workspace")

‎codersdk/workspaces.go‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,13 @@ func (c *Client) UpdateWorkspaceAutomaticUpdates(ctx context.Context, id uuid.UU
503503
returnnil
504504
}
505505

506+
typeWorkspaceFilterSharedStatusstring
507+
508+
const (
509+
WorkspaceFilterSharedWorkspaceFilterSharedStatus="shared"
510+
WorkspaceFilterNotSharedWorkspaceFilterSharedStatus="not-shared"
511+
)
512+
506513
typeWorkspaceFilterstruct {
507514
// Owner can be "me" or a username
508515
Ownerstring`json:"owner,omitempty" typescript:"-"`
@@ -516,10 +523,10 @@ type WorkspaceFilter struct {
516523
Offsetint`json:"offset,omitempty" typescript:"-"`
517524
// Limit is a limit on the number of workspaces returned.
518525
Limitint`json:"limit,omitempty" typescript:"-"`
526+
// Shared is a whether the workspace is shared with any users or groups
527+
SharedWorkspaceFilterSharedStatus`json:"shared,omitempty" typescript:"-"`
519528
// FilterQuery supports a raw filter query string
520529
FilterQuerystring`json:"q,omitempty"`
521-
// Shared is a whether the workspace is shared with any users or groups
522-
Sharedbool`json:"shared" typescript:"-"`
523530
}
524531

525532
// asRequestOption returns a function that can be used in (*Client).Request.
@@ -541,6 +548,13 @@ func (f WorkspaceFilter) asRequestOption() RequestOption {
541548
iff.Status!="" {
542549
params=append(params,fmt.Sprintf("status:%q",f.Status))
543550
}
551+
iff.Shared!="" {
552+
shared:="true"
553+
iff.Shared==WorkspaceFilterNotShared {
554+
shared="false"
555+
}
556+
params=append(params,fmt.Sprintf("shared:%v",shared))
557+
}
544558
iff.FilterQuery!="" {
545559
// If custom stuff is added, just add it on here.
546560
params=append(params,f.FilterQuery)

‎enterprise/coderd/workspaces_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3617,7 +3617,7 @@ func TestWorkspacesFiltering(t *testing.T) {
36173617
})
36183618

36193619
workspaces,err:=client.Workspaces(ctx, codersdk.WorkspaceFilter{
3620-
Shared:true,
3620+
Shared:codersdk.WorkspaceFilterShared,
36213621
})
36223622
require.NoError(t,err,"fetch workspaces")
36233623
require.Equal(t,1,workspaces.Count,"expected only one workspace")
@@ -3669,7 +3669,7 @@ func TestWorkspacesFiltering(t *testing.T) {
36693669
})
36703670

36713671
workspaces,err:=client.Workspaces(ctx, codersdk.WorkspaceFilter{
3672-
Shared:true,
3672+
Shared:codersdk.WorkspaceFilterShared,
36733673
})
36743674
require.NoError(t,err,"fetch workspaces")
36753675
require.Equal(t,1,workspaces.Count,"expected only one workspace")
@@ -3717,7 +3717,7 @@ func TestWorkspacesFiltering(t *testing.T) {
37173717
})
37183718

37193719
workspaces,err:=client.Workspaces(ctx, codersdk.WorkspaceFilter{
3720-
Shared:false,
3720+
Shared:codersdk.WorkspaceFilterNotShared,
37213721
})
37223722
require.NoError(t,err,"fetch workspaces")
37233723
require.Equal(t,1,workspaces.Count,"expected only one workspace")

0 commit comments

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