diff --git a/Directory.Packages.props b/Directory.Packages.props
index 304efb4609734da3eac4c7dbd386d19900f343a1..f46c2486f76a660a9e5b0aa5c801443bd190bc74 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -18,6 +18,7 @@
+
diff --git a/build/DaprTool.Solution.AppHost/Program.cs b/build/DaprTool.Solution.AppHost/Program.cs
index 2ec044f34d37db8656b50158781ad7c212fd838f..03a80c935a4c6700fb3e49c924f01b4cbc54d517 100644
--- a/build/DaprTool.Solution.AppHost/Program.cs
+++ b/build/DaprTool.Solution.AppHost/Program.cs
@@ -11,16 +11,6 @@ var builder = DistributedApplication.CreateBuilder(args);
builder.Services.AddProblemDetails();
-
-// proxy server
-builder.AddProject(ApplicationConstants.ProxyServer.AppId)
-//.WithReference(webAdmin)
-//.WithReference(authAdmin)
-//.WithReference(authSts)
-//.WithReference(authApi)
-//.WithReference(orderApi)
-;
-
// web admin
var webAdmin = builder.AddProject(ApplicationConstants.WebAdmin.AppId)
.WithDaprSidecar(new DaprSidecarOptions
@@ -74,7 +64,7 @@ var authApi = builder.AddProject(ApplicationConstants
var orderApi = builder.AddProject(ApplicationConstants.Ordering.AppId)
.WithDaprSidecar(new DaprSidecarOptions()
- {
+ {
AppId = ApplicationConstants.Ordering.AppId,
DaprHttpPort = ApplicationConstants.Ordering.DaprHttpPort,
ResourcesPaths = ImmutableHashSet.Empty.Add(ApplicationConstants.ResourcesPath),
@@ -84,6 +74,15 @@ var orderApi = builder.AddProject(ApplicationConstants.Or
.WithHttpEndpoint(port: ApplicationConstants.Ordering.ResourceHttpPort)
;
+// proxy server
+builder.AddProject(ApplicationConstants.ProxyServer.AppId)
+.WithReference(webAdmin)
+//.WithReference(authAdmin)
+//.WithReference(authSts)
+//.WithReference(authApi)
+//.WithReference(orderApi)
+;
+
var app = builder.Build();
diff --git a/src/IdentityServer4/src/Idsrv4.Admin.UI/Scripts/App/components/Picker.es5.js b/src/IdentityServer4/src/Idsrv4.Admin.UI/Scripts/App/components/Picker.es5.js
index 1e59d258733cfcde82b0ee1e9aee582afe0d45fb..fad4ef9be189821126b1f933227cfe5ffdd00a92 100644
--- a/src/IdentityServer4/src/Idsrv4.Admin.UI/Scripts/App/components/Picker.es5.js
+++ b/src/IdentityServer4/src/Idsrv4.Admin.UI/Scripts/App/components/Picker.es5.js
@@ -309,7 +309,7 @@ ko.components.register("picker",
'
' +
'' +
'' +
- '
' +
+ '
' +
"
" +
'' +
'' +
diff --git a/src/IdentityServer4/src/Idsrv4.Admin.UI/Scripts/App/components/Picker.es5.min.js b/src/IdentityServer4/src/Idsrv4.Admin.UI/Scripts/App/components/Picker.es5.min.js
index b6fdbee03f7754b86de7f8f33f4c58a156d6e514..eb05c1ed804f3368315ce43aefd54eef0b0e9023 100644
--- a/src/IdentityServer4/src/Idsrv4.Admin.UI/Scripts/App/components/Picker.es5.min.js
+++ b/src/IdentityServer4/src/Idsrv4.Admin.UI/Scripts/App/components/Picker.es5.min.js
@@ -1 +1 @@
-"use strict";ko.bindingHandlers.modal={init:function(n,t){$(n).modal({show:!1});var i=t();if(ko.isObservable(i))$(n).on("hidden.bs.modal",function(){i(!1)})},update:function(n,t){var i=t();ko.utils.unwrapObservable(i)?$(n).modal("show"):$(n).modal("hide")}};ko.components.register("picker",{viewModel:function(n){var t=this,i;this.textTerm=ko.observable("").extend({rateLimit:500});this.minSearchText=ko.observable(n.minSearchText||2);this.multipleSelect=ko.observable(n.multipleSelect||!1);this.searchInputPlaceholder=ko.observable(n.searchInputPlaceholder||"Enter "+this.minSearchText()+" or more characters");this.selectedItemsTitle=ko.observable(n.selectedItemsTitle||"Selected: ");this.searchResultTitle=ko.observable(n.searchResultTitle||"Search result: ");this.suggestedItemsTitle=ko.observable(n.suggestedItemsTitle||"Suggested items: ");this.noItemSelectedTitle=ko.observable(n.noItemSelectedTitle||"No item/s selected");this.showAllItemsTitle=ko.observable(n.showAllItemsTitle||"more");this.allowSuggestedItems=ko.observable(n.allowSuggestedItems&&n.url||!1);this.topSuggestedItems=ko.observable(n.topSuggestedItems||5);this.allowItemAlreadySelectedNotification=ko.observable(n.allowItemAlreadySelectedNotification||!0);this.itemAlreadySelectedTitle=ko.observable(n.itemAlreadySelectedTitle||"item already selected");this.searchResult=ko.observableArray([]);this.selectedResult=ko.observableArray(n.selectedItems||[]);this.suggestedResult=ko.observableArray([]);this.loading=ko.observable(!1);this.isVisibleEditDialog=ko.observable(!1);this.editedItem=ko.observable("");this.editedItemOriginal=ko.observable("");i=ko.toJSON(this.selectedResult);this.multipleSelect()===!0?this.selectedResult().length===0?$("#"+n.hiddenId).val(""):$("#"+n.hiddenId).val(i):this.selectedResult().length===0?$("#"+n.hiddenId).val(""):$("#"+n.hiddenId).val(this.selectedResult()[0]);this.textTerm.subscribe(function(i){i.trim()===""&&t.searchResult([]);i.trim()!==""&&i.trim().length>=t.minSearchText()&&(n.url?(t.loading(!0),$.get(n.url+"="+i,function(n){n.indexOf(i)===-1&&n.push(i);t.searchResult(n);t.loading(!1)})):t.searchResult([i]))});this.notify=function(n){toastr.options.closeButton=!0;toastr.options.preventDuplicates=!0;toastr.info(n+" "+this.itemAlreadySelectedTitle())};this.notifyError=function(n){toastr.options.closeButton=!0;toastr.options.preventDuplicates=!0;toastr.error(n)};this.add=function(n){if(n=n.replace(/'/g,"").replace(/"/g,""),this.selectedResult.indexOf(n)>-1){this.allowItemAlreadySelectedNotification()===!0&&this.notify(n);return}this.multipleSelect()===!1?(this.selectedResult([]),this.selectedResult.push(n),this.clear(),this.sync()):this.multipleSelect()===!0&&(this.selectedResult.push(n),this.clear(),this.sync())};this.getSuggestedItems=function(){t.allowSuggestedItems()!==!1&&n.url&&(t.loading(!0),$.get(n.url,{limit:t.topSuggestedItems()},function(n){t.suggestedResult(n);t.loading(!1)}))};this.clear=function(){this.textTerm("");t.searchResult([])};this.showEditDialog=function(n){t.isVisibleEditDialog(!0);t.editedItem(n);t.editedItemOriginal(n)};this.submitEditDialog=function(){if(t.editedItem().trim()!==""){if(t.checkIfItemExists(t.editedItemOriginal().trim(),t.editedItem().trim())){t.notifyError(t.editedItem().trim()+" "+this.itemAlreadySelectedTitle());return}t.update(t.editedItemOriginal().trim(),t.editedItem().trim());t.isVisibleEditDialog(!1)}};this.checkIfItemExists=function(n,t){return n.trim()===t.trim()?!1:this.selectedResult.indexOf(t)>-1?!0:!1};this.update=function(n,i){for(var r=0;r