Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[t&p] add workspaces to teams #5555

Merged
merged 1 commit into from Sep 27, 2021
Merged

[t&p] add workspaces to teams #5555

merged 1 commit into from Sep 27, 2021

Conversation

svenefftinge
Copy link
Member

@svenefftinge svenefftinge commented Sep 6, 2021

This PR adds a workspaces tab to teams and projects, showing only the relevant workspaces.
Also under the individual account no workspaces that are created in the context of teams are shown anymore.
This PR also removes active and inactive filter and instead shows both at once. Finally, a few layout things have been aligned based on the design from @gtsiolis.

fixes #4921

How to test

login, create team(s) and create projects below. Now start workspaces for different projects and also non-project contexts.
Verify that the workspaces are shown properly.

NONE

@svenefftinge
Copy link
Member Author

svenefftinge commented Sep 7, 2021

/werft run

👍 started the job as gitpod-build-se-workspace-for-teams.1

@svenefftinge
Copy link
Member Author

I'm concerned splitting the workspace lists like this will confuse users. They might look for their workspaces in the wrong place. @gtsiolis @AlexTugarev Can you try and share your thoughts on this?

The main idea was to better communicate which workspaces are accounted to which (account/team). Some thoughts I had are:

  • We could have one global workspaces list (maybe workspaces on the top right in the menu).
  • Have workspaces tab under user, team, project that by default has a filtered view, but users can remove that filter with one click.

@AlexTugarev
Copy link
Member

That's an interesting view. Discoverability of workspaces wasn't nothing I thought of. Now that you picked that up, I think switching context (e.g. searching a workspace in another project) might be more difficult. The easiest way would still be to use a search filter in a single list of workspaces. Perhaps adding a column Project would help in getting a proper view.

@AlexTugarev
Copy link
Member

Thinking further, I'd like to raise another concern with "team workspaces". Correct me if I'm wrong, but does this mean, that another team member may restart one of my workspaces? Iff so...

  • what about permissions when I want to access the workspace which is started by another user?
  • what about data protection? perhaps I left a private key in my workspace by accident, or similar stupid thing
  • what about controlling the workspace? may a team member stop my workspace?

@gtsiolis
Copy link
Contributor

gtsiolis commented Sep 7, 2021

/werft run

👍 started the job as gitpod-build-se-workspace-for-teams.4

@gtsiolis
Copy link
Contributor

gtsiolis commented Sep 7, 2021

Correct me if I'm wrong, but does this mean, that another team member may restart one of my workspaces?

@AlexTugarev The idea was to group workspaces by team and keep ownership and access only to each user as is. ❗

🧀 🧀 🧀 🧀

We could have one global workspaces list

@svenefftinge I think keeping the global list we have now is good for improving (workspace) discoverability and avoid disrupting existing user flows.

🥝 🥝 🥝 🥝

(maybe workspaces on the top right in the menu)

🅰️ One option could be to have a top-level Workspaces menu entry that links back to the existing Workspaces tab within a user. 🅱️ Alternatively, the global list could be a top level page that moves aways from the tabs or a specific namespace (team, etc.)

🅰️ Using Existing Tab 🅱️ Using New Page
Screenshot 2021-09-07 at 11 36 20 PM (2) Screenshot 2021-09-07 at 11 15 16 PM (2)

🍊 🍊 🍊 🍊

Have workspaces tab under user, team, project that by default has a filtered view, but users can remove that filter with one click.

@svenefftinge We could re-introduce a New Workspace button (primary) on the project page (Branches) which is missing now (❗) and couple it with a View Workspaces button (secondary) that redirects to the global workspaces list filtered down to the 🅰️ project or 🅱️ team. 💭

🅰️ Project 🅱️ Team
Screenshot 2021-09-07 at 10 58 37 PM (2) Screenshot 2021-09-07 at 10 53 48 PM (2)

🍋 🍋 🍋 🍋

Although out of the scope of these changes, merging active and all workspaces could help.

#5279

@svenefftinge
Copy link
Member Author

svenefftinge commented Sep 10, 2021

@svenefftinge We could re-introduce a New Workspace button (primary) on the project page (Branches) which is missing now (❗) and couple it with a View Workspaces button (secondary) that redirects to the global workspaces list filtered down to the 🅰️ project or 🅱️ team. 💭

🅰️ Project 🅱️ Team
Screenshot 2021-09-07 at 10 58 37 PM (2) Screenshot 2021-09-07 at 10 53 48 PM (2)

Sounds and looks good to me 👍

🍋 🍋 🍋 🍋

Although out of the scope of these changes, merging active and all workspaces could help.

💯

@svenefftinge
Copy link
Member Author

svenefftinge commented Sep 21, 2021

/werft run

👍 started the job as gitpod-build-se-workspace-for-teams.6

@svenefftinge
Copy link
Member Author

svenefftinge commented Sep 21, 2021

/werft run

👍 started the job as gitpod-build-se-workspace-for-teams.7

@svenefftinge
Copy link
Member Author

svenefftinge commented Sep 21, 2021

/werft run

👍 started the job as gitpod-build-se-workspace-for-teams.8

@svenefftinge
Copy link
Member Author

svenefftinge commented Sep 22, 2021

/werft run

👍 started the job as gitpod-build-se-workspace-for-teams.9

@AlexTugarev
Copy link
Member

AlexTugarev commented Sep 23, 2021

/werft run

👍 started the job as gitpod-build-se-workspace-for-teams.11

inactiveWorkspaces.length === 0 ? null :
<Item className="w-full bg-gray-50 py-3 px-3">
<ItemField className=" flex flex-col">
<div className="text-gray-400 text-sm text-center">Unpinned workspaces that have been inactive for more than 14 days will be automatically deleted. <a className="gp-link" href="https://www.gitpod.io/docs/life-of-workspace/#garbage-collection">Learn more</a></div>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue: Could we also make the background on the default state for the dark theme darker here like bg-gray-800, besides removing the hover state (see https://github.com/gitpod-io/gitpod/pull/5555/files#r715033220)? Sounds good also as a follow up issue as this affects the Item List component. 😬

BEFORE AFTER
Screenshot 2021-09-24 at 4 16 27 PM (2) Screenshot 2021-09-24 at 4 16 30 PM (2)

@svenefftinge
Copy link
Member Author

svenefftinge commented Sep 27, 2021

/werft run

👍 started the job as gitpod-build-se-workspace-for-teams.15

@AlexTugarev
Copy link
Member

AlexTugarev commented Sep 27, 2021

Screen Shot 2021-09-27 at 16 22 32

This isn't a big thing, but for personal and not project-tagged workspaces I'd expect a different message/action than New Project


To be fixed in https://github.com/gitpod-io/gitpod/compare/545d11d4904aa6dc4057926fc4830dea22a2b905..714099e0b4f169f8e38fa95890651ff5dd8cc0d3

@AlexTugarev
Copy link
Member

AlexTugarev commented Sep 27, 2021

/lgtm

Verified that it works as advertised 👍🏻

/hold just in case there are more minor tweaks to do

@roboquat
Copy link
Contributor

LGTM label has been added.

Git tree hash: 51d6f9018f96535cb0567da074f291a8135feb47

@roboquat
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: AlexTugarev

Associated issue: #4921

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@svenefftinge
Copy link
Member Author

/hold cancel

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[dashboard] Have Workspaces below teams as well
4 participants