Skip to content

Suffix ISFS folder name with web app path #1484

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Feb 13, 2025
Merged

Suffix ISFS folder name with web app path #1484

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
40248f2
Suffix ISFS folder name with web app path
gjsjohnmurray Feb 13, 2025
bec87cb
Use shorter default names for new ISFS folders in workspace
gjsjohnmurray Feb 13, 2025
2cd61cc
Tweak naming pattern
gjsjohnmurray Feb 13, 2025
8a09324
Revert change to project folder naming pattern
gjsjohnmurray Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/commands/addServerNamespaceToWorkspace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

@isc-bsaviano isc-bsaviano Feb 13, 2025

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

@gjsjohnmurray gjsjohnmurray Feb 13, 2025

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

@isc-bsaviano isc-bsaviano Feb 13, 2025

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

@gjsjohnmurray gjsjohnmurray Feb 13, 2025

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

@isc-bsaviano isc-bsaviano Feb 13, 2025

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

@gjsjohnmurray gjsjohnmurray Feb 13, 2025

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

@isc-bsaviano isc-bsaviano Feb 13, 2025

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.

scheme == FILESYSTEM_READONLY_SCHEMA && !project ? " (read-only)" : ""
}`;
// Append it to the workspace
Expand Down