Skip to content

Commit 0ee080e

Browse files
committed
Package manager awareness for web UI
Surprisingly easy!
1 parent 31d0121 commit 0ee080e

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

cls/SourceControl/Git/Utils.cls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ ClassMethod UserAction(InternalName As %String, MenuName As %String, ByRef Targe
157157
}
158158
} elseif (menuItemName = "%GitWebUI") {
159159
set Action = 2
160-
set Target = "/isc/studio/usertemplates/gitsourcecontrol/webuidriver.csp/"_$namespace
160+
set Target = "/isc/studio/usertemplates/gitsourcecontrol/webuidriver.csp/"_$namespace_"/"_$ZConvert(InternalName,"O","URL")
161161
} elseif (menuItemName = "%Export") || (menuItemName = "%ExportForce") {
162162
write "==export start==",!
163163
set ec = ..ExportAll($case(menuItemName="%ExportForce",1:$$$Force,:0))

cls/SourceControl/Git/WebUIDriver.cls

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
Class SourceControl.Git.WebUIDriver
22
{
33

4-
ClassMethod HandleRequest(pagePath As %String, Output handled As %Boolean = 0, Output %data As %Stream.Object)
4+
ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Output handled As %Boolean = 0, Output %data As %Stream.Object)
55
{
6+
set context = ##class(SourceControl.Git.PackageManagerContext).ForInternalName(InternalName)
67
kill %data
78
#dim %response As %CSP.Response
89
#dim %request As %CSP.Request

csp/webuidriver.csp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
set url = $Piece($Get(%request.CgiEnvs("REQUEST_URI"),$Get(%request.CgiEnvs("HTTP_URL"))),"?")
33
set pagePath = $Piece(url,..#CSPURL,2,*)
44
set namespace = $Piece(pagePath,"/",2)
5-
set resource = $Piece(pagePath,"/",3,*)
6-
set %base = $Piece(url,..#CSPURL,1)_..#CSPURL_"/"_namespace_"/"
5+
set internalName = $ZConvert($Piece(pagePath,"/",3),"I","URL")
6+
set resource = $Piece(pagePath,"/",4,*)
7+
set %base = $Piece(url,..#CSPURL,1)_..#CSPURL_"/"_namespace_"/"_$ZConvert(internalName,"O","URL")_"/"
78

89
new $NAMESPACE
910
set $NAMESPACE = namespace
@@ -39,7 +40,7 @@
3940
}
4041

4142
// Handles HTTP requests to /api/ (everything new) plus things previously sent to the Python backend
42-
do ##class(SourceControl.Git.WebUIDriver).HandleRequest("/"_resource, .handled, .%data)
43+
do ##class(SourceControl.Git.WebUIDriver).HandleRequest("/"_resource, internalName, .handled, .%data)
4344
if handled {
4445
kill %base
4546
quit 1

0 commit comments

Comments
 (0)