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

Suffix ISFS folder name with web app path #1484

Merged
merged 4 commits into from
Feb 13, 2025

Conversation

gjsjohnmurray
Copy link
Contributor

@gjsjohnmurray gjsjohnmurray commented Feb 13, 2025

This PR fixes #1483

image

Before the change the result was:

image

@@ -146,7 +146,7 @@ export async function addServerNamespaceToWorkspace(resource?: vscode.Uri): Prom
const params = new URLSearchParams(uri.query);
const project = params.get("project");
const csp = params.has("csp");
const name = `${project ? `${project} - ` : ""}${serverName}:${namespace}${csp ? " web files" : ""}${
const name = `${project ? `${project} - ` : ""}${serverName}:${namespace}${!csp ? "" : ["", "/"].includes(uri.path) ? " web files" : ` web files (${uri.path})`}${
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we make the names shorter? How about server:NS (Web) and server (app/path)? We should change the project one to server:NS (project) as well to match.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Like this?

image

Seems OK as long as I don't have a project named "Web"

Copy link
Contributor

Choose a reason for hiding this comment

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

I like that better, but I think we can remove the namespace when we're tied to a specific web app. IMO that extra info isn't worth the space in that case. I see what you mean with the potential web and project conflict. Do you want to leave the "web files" suffix then? I doubt that conflict will come up in reality but it could be confusing for a user if it does.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

How about this?

image

Copy link
Contributor

Choose a reason for hiding this comment

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

Looks good to me!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm having second thoughts about the change we've made to how a project folder gets named. Some people might not like how the project name is demoted. Here's the old way:

image

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh, I forgot that the project used to come first! I agree, let's put that back.

isc-bsaviano
isc-bsaviano previously approved these changes Feb 13, 2025
@gjsjohnmurray gjsjohnmurray merged commit aae0541 into intersystems-community:master Feb 13, 2025
5 checks passed
@gjsjohnmurray gjsjohnmurray deleted the fix-1483 branch February 13, 2025 16:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Duplicate-named ISFS web files folders get added
2 participants