Skip to content

Commit 8d6c6fa

Browse files
authored
Improve isfs folder creation/modification UX (intersystems-community#1090)
1 parent f308dfa commit 8d6c6fa

11 files changed

+321
-80
lines changed

docs/ServerSide.md

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,21 @@ Next create a workspace for editing code directly on the server:
2828
1. Pick a namespace from the list retrieved from the target server:
2929

3030
![Choose a namespace.](../assets/images/ss-choose-namespace.png "choose a namespace")
31-
1. Pick if this folder should show a project's contents:
31+
1. Pick an access mode from the list:
3232

33-
![Choose if project.](../assets/images/ss-is-project.png "choose if project")
34-
1. If yes, pick the project from the list, or click the **+** sign to create a new one:
33+
![Choose an access type.](../assets/images/ss-access-type.png "choose an access type")
34+
1. Pick the files to show:
3535

36-
![Choose project.](../assets/images/ss-pick-project.png "choose project")
37-
1. Pick an access mode from the list:
36+
![Choose files.](../assets/images/ss-files.png "choose files")
37+
- If you chose to show web application files, pick an optional web application to show files from:
3838

39-
If no project was selected:
39+
![Choose files.](../assets/images/ss-pick-webapp.png "choose files")
40+
- If you chose to show a project's contents, pick the project:
4041

41-
![Choose an access type.](../assets/images/ss-access-type.png "choose an access type")
42+
![Choose files.](../assets/images/ss-pick-project.png "choose files")
43+
- If you create your own filter, pick the filter options:
4244

43-
If a project was selected:
44-
45-
![Choose an access type (project).](../assets/images/ss-access-type-project.png "choose an access type (project")
45+
![Choose query parameters.](../assets/images/ss-query-params.png "choose query parameters")
4646
1. If you want to reopen this workspace in the future, use the command **File > Save Workspace As...** to save it as a `.code-workspace` file.
4747

4848
Note that the ObjectScript Explorer view is not visible in the ObjectScript view container. Because the files listed in the Explorer view are all on the server, the ObjectScript Explorer is not needed for this configuration.
@@ -157,6 +157,8 @@ The query string of the `uri` property accepts several parameters that control f
157157

158158
The options `flat`, `generated` and `mapped` can be combined with each other, and with `type` or `filter`. If `filter` is specified, `type` is ignored.
159159

160+
To modify the query parameters or name of an existing workspace folder, run the `Modify Server-Side Workspace Folder...` command from the command palette or the file explorer context menu.
161+
160162
## Advanced Workspace Configurations
161163

162164
This section gives examples of some more complex workspace definitions for server-side editing.
-21.1 KB
Binary file not shown.

docs/assets/images/ss-access-type.png

31.7 KB
Loading

docs/assets/images/ss-files.png

66.8 KB
Loading

docs/assets/images/ss-is-project.png

-8.95 KB
Binary file not shown.
20.3 KB
Loading

docs/assets/images/ss-pick-webapp.png

23.2 KB
Loading
103 KB
Loading

package.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
"onCommand:vscode-objectscript.newFile.rule",
8787
"onCommand:vscode-objectscript.newFile.businessService",
8888
"onCommand:vscode-objectscript.newFile.dtl",
89+
"onCommand:vscode-objectscript.modifyWsFolder",
8990
"onCommand:vscode-objectscript.openErrorLocation",
9091
"onLanguage:objectscript",
9192
"onLanguage:objectscript-int",
@@ -329,6 +330,10 @@
329330
"command": "vscode-objectscript.showRESTDebugWebview",
330331
"when": "editorLangId =~ /^objectscript/ && vscode-objectscript.connectActive"
331332
},
333+
{
334+
"command": "vscode-objectscript.modifyWsFolder",
335+
"when": "vscode-objectscript.connectActive && workspaceFolderCount != 0"
336+
},
332337
{
333338
"command": "vscode-objectscript.openErrorLocation",
334339
"when": "vscode-objectscript.connectActive && workspaceFolderCount != 0"
@@ -591,6 +596,11 @@
591596
"command": "vscode-objectscript.importLocalFilesServerSide",
592597
"when": "vscode-objectscript.connectActive && resourceScheme == isfs && explorerResourceIsRoot",
593598
"group": "objectscript_modify@2"
599+
},
600+
{
601+
"command": "vscode-objectscript.modifyWsFolder",
602+
"when": "vscode-objectscript.connectActive && resourceScheme =~ /^isfs(-readonly)?$/ && explorerResourceIsRoot",
603+
"group": "objectscript_modify@3"
594604
}
595605
],
596606
"file/newFile": [
@@ -1089,6 +1099,11 @@
10891099
"command": "vscode-objectscript.showRESTDebugWebview",
10901100
"title": "Debug REST Service..."
10911101
},
1102+
{
1103+
"category": "ObjectScript",
1104+
"command": "vscode-objectscript.modifyWsFolder",
1105+
"title": "Modify Server-side Workspace Folder..."
1106+
},
10921107
{
10931108
"category": "ObjectScript",
10941109
"command": "vscode-objectscript.openErrorLocation",

0 commit comments

Comments
 (0)