Extend admin workspace search #4111
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mads-hartmann
force-pushed
the
mads/admin-workspace-search-3992
branch
from
f1fb044 to
f35e5d1
Compare
Contributor
Author
|
/werft run 👍 started the job as gitpod-build-mads-admin-workspace-search-3992.3 |
Contributor
Author
|
/werft run 👍 started the job as gitpod-build-mads-admin-workspace-search-3992.5 |
Contributor
Author
Contributor
Author
|
Currently blocked by #4120 |
Extend search conditions to include instance UUID and workspace ID Fixes #3992
mads-hartmann
force-pushed
the
mads/admin-workspace-search-3992
branch
from
94150c8 to
855d700
Compare
gtsiolis
reviewed
May 28, 2021
Contributor
There was a problem hiding this comment.
Hey @gtsiolis, can you give me some pointers on how best to fix this UI issue I've introduced?
@mads-hartmann Whoa, somehow I've missed the ping in https://github.com/gitpod-io/gitpod/pull/4111#issuecomment-829999007!🏓
Pasting below how this could look like.
| A | B |
|---|---|
 |
 |
Comment on lines
+305
to
+346
| @test(timeout(10000)) | ||
| public async testFindAllWorkspaceAndInstances_workspaceId() { | ||
| await this.db.transaction(async db => { | ||
| await Promise.all([ | ||
| db.store(this.ws), | ||
| db.storeInstance(this.wsi1), | ||
| db.store(this.ws2), | ||
| db.storeInstance(this.ws2i1), | ||
| ]); | ||
| const dbResult = await db.findAllWorkspaceAndInstances(0, 10, "workspaceId", "DESC", undefined, this.ws2.id); | ||
| // It should only find one workspace instance | ||
| expect(dbResult.total).to.eq(1); | ||
|
|
||
| // It should find the workspace with the queried id | ||
| const workspaceAndInstance = dbResult.rows[0] | ||
| expect(workspaceAndInstance.workspaceId).to.eq(this.ws2.id) | ||
| }); | ||
| } | ||
|
|
||
| @test(timeout(10000)) | ||
| public async testFindAllWorkspaceAndInstances_instanceId() { | ||
| await this.db.transaction(async db => { | ||
| await Promise.all([ | ||
| db.store(this.ws), | ||
| db.storeInstance(this.wsi1), | ||
| db.storeInstance(this.wsi2), | ||
| db.store(this.ws2), | ||
| db.storeInstance(this.ws2i1), | ||
| ]); | ||
| const dbResult = await db.findAllWorkspaceAndInstances(0, 10, "instanceId", "DESC", undefined, this.wsi1.id); | ||
|
|
||
| // It should only find one workspace instance | ||
| expect(dbResult.total).to.eq(1); | ||
|
|
||
| // It should find the workspace with the queried id | ||
| const workspaceAndInstance = dbResult.rows[0] | ||
| expect(workspaceAndInstance.workspaceId).to.eq(this.ws.id) | ||
|
|
||
| // It should select the workspace instance that was queried, not the most recent one | ||
| expect(workspaceAndInstance.instanceId).to.eq(this.wsi1.id) | ||
| }); | ||
| } |
Contributor
There was a problem hiding this comment.
praise: Haven't tried running these but thanks for adding these tests! 🌟
Co-authored-by: George Tsiolis <[email protected]>
Contributor
Author
|
@geropl or @corneliusludmann could one of you have a look please :) |
Contributor
|
/werft run 👍 started the job as gitpod-build-mads-admin-workspace-search-3992.10 |
corneliusludmann
approved these changes
Jun 8, 2021
Contributor
corneliusludmann
left a comment
corneliusludmann
left a comment
There was a problem hiding this comment.
Looks good! (one tiny comment inline / not a blocker)
Thanks! 👍
Co-authored-by: Cornelius A. Ludmann <[email protected]>
MatthewFagan
pushed a commit
to trilogy-group/gitpod
that referenced
this pull request
Nov 23, 2021
* Extend workspace admin search Extend search conditions to include instance UUID and workspace ID Fixes gitpod-io#3992 * Update placeholder Co-authored-by: George Tsiolis <[email protected]> * Use title capitalisation for placeholder test Co-authored-by: Cornelius A. Ludmann <[email protected]> Co-authored-by: George Tsiolis <[email protected]> Co-authored-by: Cornelius A. Ludmann <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This extends the admin workspace search so that besides searching for the context url you can for the Workspace ID or Workspace Instance ID.
See issue #3992