Skip to content

Commit 7ee54ca

Browse files
isc-etamarchisc-etamarch
committed
Added Environment
Ask for environment in configuration; Add changing environment in settings; Show environment in UI
1 parent b6eb0ba commit 7ee54ca

File tree

9 files changed

+75
-1
lines changed

9 files changed

+75
-1
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1313
- Added link back to IRIS management portal from Settings, Git WebUI pages (#449)
1414
- Added Import all and Import All (Force) to basic mode menu (#498)
1515
- Improved behavior for commits when attribution settings are not configured (#450)
16+
- Added environment awareness in configuration, and showing of environment name in UI (#124)
1617

1718
### Fixed
1819
- Changed prompts in configure from 0/1 to no/yes (#461)

‎cls/SourceControl/Git/Settings.cls

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ Property namespaceLevelGitWebApp As %Boolean [ InitialExpression = {##class(Sour
5353
/// Warn when an item has uncommitted changes in a different namespace in this instance
5454
Property warnInstanceWideUncommitted As %Boolean [ InitialExpression = {##class(SourceControl.Git.Utils).WarnInstanceWideUncommitted()} ];
5555

56+
/// The name of the environment (DEVELOPMENT, TEST, LIVE)
57+
Property environmentName As %String(MAXLEN = "", VALUELIST = ",DEVELOPMENT,TEST,LIVE") [ InitialExpression = {##class(SourceControl.Git.Utils).EnvironmentName()} ];
58+
5659
Property Mappings [ MultiDimensional ];
5760

5861
Method %OnNew() As %Status
@@ -110,12 +113,16 @@ Method %Save() As %Status
110113
set @storage@("settings", "compileOnImport") = ..compileOnImport
111114
set @storage@("settings", "warnInstanceWideUncommitted") = ..warnInstanceWideUncommitted
112115
set @storage@("settings", "basicMode") = ..systemBasicMode
116+
set @storage@("settings", "environmentName") = ..environmentName
113117
if ..basicMode = "system" {
114118
kill @storage@("settings", "user", $username, "basicMode")
115119
} else {
116120
set @storage@("settings", "user", $username, "basicMode") = ..basicMode
117121
}
118122

123+
set ^%SYS("SystemMode") = ..environmentName
124+
125+
119126
// update value of basicUserMode to reflect the updated setting for basicMode
120127
set ..userBasicMode = ##class(SourceControl.Git.Utils).UserBasicMode()
121128

@@ -171,6 +178,13 @@ ClassMethod Configure() As %Boolean [ CodeMode = objectgenerator ]
171178
do %code.WriteLine(" if value = ""System's Default Mode"" { set value = ""system""}")
172179
do %code.WriteLine(" elseif value = ""Yes"" { set value = 1}")
173180
do %code.WriteLine(" elseif value = ""No"" { set value = 0}")
181+
} elseif ((propertyDef) && (propertyDef.Name = "environmentName")) {
182+
do %code.WriteLine(" set list(1) = ""DEVELOPMENT""")
183+
do %code.WriteLine(" set list(2) = ""TEST""")
184+
do %code.WriteLine(" set list(3) = ""LIVE""")
185+
do %code.WriteLine(" set list(4) = """"")
186+
do %code.WriteLine(" set value = """"")
187+
do %code.WriteLine(" set response = ##class(%Library.Prompt).GetArray("_promptQuoted_",.value,.list,,,,"_defaultPromptFlag_")")
174188
} else {
175189
do %code.WriteLine(" set response = ##class(%Library.Prompt).GetString("_promptQuoted_",.value,,,,"_defaultPromptFlag_")")
176190
}

‎cls/SourceControl/Git/Utils.cls

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,16 @@ ClassMethod WarnInstanceWideUncommitted() As %Boolean
163163
quit $get(@..#Storage@("settings","warnInstanceWideUncommitted"),1)
164164
}
165165

166+
ClassMethod EnvironmentName() As %String
167+
{
168+
quit $get(@..#Storage@("settings","environmentName"),1)
169+
}
170+
171+
ClassMethod IsLIVE() As %Boolean
172+
{
173+
quit $get(@..#Storage@("settings","environmentName"),1)="LIVE"
174+
}
175+
166176
ClassMethod NeedSettings() As %Boolean [ CodeMode = expression ]
167177
{
168178
(..TempFolder() = "") || (..GitBinPath() = "") || (..GitBinPath() = """")

‎cls/SourceControl/Git/WebUIDriver.cls

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
2626
set responseJSON = {
2727
"url": (..GetHomeURL())
2828
}
29+
} elseif $extract(pagePath,6,*) = "environment" {
30+
set responseJSON = {
31+
"environment": (##class(SourceControl.Git.Utils).EnvironmentName())
32+
}
2933
} else {
3034
set %response.Status = ##class(%CSP.REST).#HTTP404NOTFOUND
3135
set responseJSON = {"error":("invalid URI: " _ pagePath)}

‎csp/gitprojectsettings.csp

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ body {
8484
set $Property(settings,param) = $Get(%request.Data(param,1))
8585
}
8686
if ('settings.settingsUIReadOnly) {
87-
for param="gitBinPath","namespaceTemp","privateKeyFile","pullEventClass","percentClassReplace", "defaultMergeBranch" {
87+
for param="gitBinPath","namespaceTemp","privateKeyFile","pullEventClass","percentClassReplace", "defaultMergeBranch","environmentName" {
8888
set $Property(settings,param) = $Get(%request.Data(param,1))
8989
}
9090

@@ -292,6 +292,20 @@ body {
292292
</div>
293293
</div>
294294

295+
<div class="form-group row mb-3">
296+
<label for="environmentName" class="offset-sm-1 col-sm-3 col-form-label" data-toggle="tooltip" data-placement="top" title="Environment Name">Environment Name</label>
297+
<div class="col-sm-7">
298+
<select class="form-control" id="environmentName" name="environmentName">
299+
<server>
300+
for envName = "TEST","DEVELOPMENT","LIVE","" {
301+
// create option with envName, set selected if envName == current environmentName
302+
&html<<option #($CASE(envName, settings.environmentName: "selected", :""))# value=#(envName)#>#(envName)# </option>>
303+
}
304+
</server>
305+
</select>
306+
</div>
307+
</div>
308+
295309
<div class="form-group row mb-3">
296310
<label for="percentClassReplace" class="offset-sm-1 col-sm-3 col-form-label" data-toggle="tooltip" data-placement="top" title="Character(s) to replace '%' with for percent classes while exporting them out to the filesystem. By default, the '%' is removed.">'%' Replacement on Export</label>
297311
<div class="col-sm-7">

‎git-webui/release/share/git-webui/webui/css/git-webui.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -900,6 +900,11 @@ body {
900900
#workspace-view .diff-line-offset {
901901
cursor: pointer;
902902
}
903+
#environment {
904+
color: white;
905+
font-size: 1em;
906+
align-self: center;
907+
}
903908
#changedFilesContainer {
904909
max-width: 100% !important;
905910
margin: 0 10px;

‎git-webui/release/share/git-webui/webui/js/git-webui.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,14 @@ webui.SideBarView = function(mainView, noEventHandlers) {
606606
})
607607
}
608608

609+
self.getEnvironment = function() {
610+
$.get("api/environment", function(environment) {
611+
var env = JSON.parse(environment)["environment"];
612+
$("#environment").text(env)
613+
614+
});
615+
};
616+
609617
self.changeContextGet = function() {
610618
$.get("contexts", function(contextList) {
611619
var contexts = JSON.parse(contextList);
@@ -974,6 +982,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
974982
self.element = $( '<div id="sidebar">' +
975983
'<a href="#" data-toggle="modal" data-target="#help-modal"><img id="sidebar-logo" src="img/git-logo.png"></a>' +
976984
'<h5 id="packageVersion"></h5>' +
985+
'<h4 id="environment"></h4>'+
977986
'<div id="sidebar-content">' +
978987
'<section id="sidebar-workspace">' +
979988
'<h4>Workspace</h4>' +
@@ -1051,6 +1060,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
10511060
}
10521061

10531062
self.getPackageVersion();
1063+
self.getEnvironment()
10541064
self.fetchSection($("#sidebar-local-branches", self.element)[0], "Local Branches", "local-branches", "branch --verbose --verbose");
10551065
self.fetchSection($("#sidebar-remote-branches", self.element)[0], "Remote Branches", "remote-branches", "branch --remotes");
10561066
self.fetchSection($("#sidebar-tags", self.element)[0], "Tags", "tags", "tag");

‎git-webui/src/share/git-webui/webui/css/git-webui.less

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -883,6 +883,12 @@ body {
883883
}
884884
}
885885

886+
#environment {
887+
color:white;
888+
font-size: 1em;
889+
align-self: center;
890+
}
891+
886892
#changedFilesContainer {
887893
max-width: 100% !important;
888894
margin: 0 10px;

‎git-webui/src/share/git-webui/webui/js/git-webui.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,14 @@ webui.SideBarView = function(mainView, noEventHandlers) {
606606
})
607607
}
608608

609+
self.getEnvironment = function() {
610+
$.get("api/environment", function(environment) {
611+
var env = JSON.parse(environment)["environment"];
612+
$("#environment").text(env)
613+
614+
});
615+
};
616+
609617
self.changeContextGet = function() {
610618
$.get("contexts", function(contextList) {
611619
var contexts = JSON.parse(contextList);
@@ -974,6 +982,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
974982
self.element = $( '<div id="sidebar">' +
975983
'<a href="#" data-toggle="modal" data-target="#help-modal"><img id="sidebar-logo" src="img/git-logo.png"></a>' +
976984
'<h5 id="packageVersion"></h5>' +
985+
'<h4 id="environment"></h4>'+
977986
'<div id="sidebar-content">' +
978987
'<section id="sidebar-workspace">' +
979988
'<h4>Workspace</h4>' +
@@ -1051,6 +1060,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
10511060
}
10521061

10531062
self.getPackageVersion();
1063+
self.getEnvironment()
10541064
self.fetchSection($("#sidebar-local-branches", self.element)[0], "Local Branches", "local-branches", "branch --verbose --verbose");
10551065
self.fetchSection($("#sidebar-remote-branches", self.element)[0], "Remote Branches", "remote-branches", "branch --remotes");
10561066
self.fetchSection($("#sidebar-tags", self.element)[0], "Tags", "tags", "tag");

0 commit comments

Comments
 (0)