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

Commit5dbf5b4

Browse files
committed
Add name filter
1 parent424e933 commit5dbf5b4

File tree

5 files changed

+34
-24
lines changed

5 files changed

+34
-24
lines changed

‎site/src/api/api.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@ describe("api.ts", () => {
118118
it.each<[TypesGen.WorkspaceFilter|undefined,string]>([
119119
[undefined,"/api/v2/workspaces"],
120120

121-
[{OrganizationID:"1",Owner:""},"/api/v2/workspaces?organization_id=1"],
122-
[{OrganizationID:"",Owner:"1"},"/api/v2/workspaces?owner=1"],
121+
[{organization_id:"1",owner:""},"/api/v2/workspaces?organization_id=1"],
122+
[{organization_id:"",owner:"1"},"/api/v2/workspaces?owner=1"],
123123

124-
[{OrganizationID:"1",Owner:"me"},"/api/v2/workspaces?organization_id=1&owner=me"],
124+
[{organization_id:"1",owner:"me"},"/api/v2/workspaces?organization_id=1&owner=me"],
125125
])(`getWorkspacesURL(%p) returns %p`,(filter,expected)=>{
126126
expect(getWorkspacesURL(filter)).toBe(expected)
127127
})

‎site/src/api/api.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,14 @@ export const getWorkspacesURL = (filter?: TypesGen.WorkspaceFilter): string => {
116116
constbasePath="/api/v2/workspaces"
117117
constsearchParams=newURLSearchParams()
118118

119-
if(filter?.OrganizationID){
120-
searchParams.append("organization_id",filter.OrganizationID)
119+
if(filter?.organization_id){
120+
searchParams.append("organization_id",filter.organization_id)
121121
}
122-
if(filter?.Owner){
123-
searchParams.append("owner",filter.Owner)
122+
if(filter?.owner){
123+
searchParams.append("owner",filter.owner)
124+
}
125+
if(filter?.name){
126+
searchParams.append("name",filter.name)
124127
}
125128

126129
constsearchString=searchParams.toString()

‎site/src/api/typesGenerated.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -443,10 +443,9 @@ export interface WorkspaceBuildsRequest extends Pagination {
443443

444444
// From codersdk/workspaces.go:201:6
445445
exportinterfaceWorkspaceFilter{
446-
readonlyOrganizationID:string
447-
readonlyOwner:string
448-
readonlyName:string
449-
readonlyDeleted:boolean
446+
readonlyorganization_id?:string
447+
readonlyowner?:string
448+
readonlyname?:string
450449
}
451450

452451
// From codersdk/workspaceresources.go:21:6

‎site/src/util/workspace.test.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,12 @@ describe("util > workspace", () => {
6565
})
6666
describe("workspaceQueryToFilter",()=>{
6767
it.each<[string|undefined,TypesGen.WorkspaceFilter]>([
68-
[undefined,{Owner:"",OrganizationID:""}],
69-
["",{Owner:"",OrganizationID:""}],
70-
["asdkfvjn",{Owner:"",OrganizationID:""}],
71-
["owner:me",{Owner:"me",OrganizationID:""}],
72-
["owner:me owner:me2",{Owner:"me",OrganizationID:""}],
68+
[undefined,{}],
69+
["",{}],
70+
["asdkfvjn",{name:"asdkfvjn"}],
71+
["owner:me",{owner:"me"}],
72+
["owner:me owner:me2",{owner:"me"}],
73+
["me/dev",{owner:"me",name:"dev"}],
7374
])(`query=%p, filter=%p`,(query,filter)=>{
7475
expect(workspaceQueryToFilter(query)).toEqual(filter)
7576
})

‎site/src/util/workspace.ts

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ export const isWorkspaceOn = (workspace: TypesGen.Workspace): boolean => {
199199
returntransition==="start"&&status==="succeeded"
200200
}
201201

202+
<<<<<<<HEAD
202203

203204
exportconstdefaultWorkspaceExtension=(__startDate?:dayjs.Dayjs):TypesGen.PutExtendWorkspaceRequest=>{
204205
constnow=__startDate ?dayjs(__startDate) :dayjs()
@@ -209,12 +210,8 @@ export const defaultWorkspaceExtension = (__startDate?: dayjs.Dayjs): TypesGen.P
209210
}
210211
}
211212

212-
exportconstworkspaceQueryToFilter=(query?:string):WorkspaceFilter=>{
213-
constdefaultFilter:WorkspaceFilter={
214-
Owner:"",
215-
OrganizationID:"",
216-
}
217-
213+
exportconstworkspaceQueryToFilter=(query?:string):TypesGen.WorkspaceFilter=>{
214+
constdefaultFilter:TypesGen.WorkspaceFilter={}
218215
constpreparedQuery=query?.replace(/+/g," ")
219216

220217
if(!preparedQuery){
@@ -226,10 +223,20 @@ export const workspaceQueryToFilter = (query?: string): WorkspaceFilter => {
226223
const[key,val]=part.split(":")
227224
if(key==="owner"){
228225
return{
229-
Owner:val,
230-
OrganizationID:"",
226+
owner:val,
227+
}
228+
}
229+
230+
const[username,name]=part.split("/")
231+
if(username&&name){
232+
return{
233+
owner:username,
234+
name:name,
231235
}
232236
}
237+
return{
238+
name:part,
239+
}
233240
}
234241

235242
returndefaultFilter

0 commit comments

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