Skip to content

Commit

Permalink
MB-43762 MB-43461: Enable runtime settings only
Browse files Browse the repository at this point in the history
Backports UI changes for Feed Boundary and a tooltip
message for timer context size

* The  frozen drop down in the deploy pop up is replaced
  with a boxed text
* Free Feed Boundary when the function is deployed
* Added a tooltip message for  max timer context size

Change-Id: I831bb97376a397181b8013d63ee18e4f5ffb1330
Reviewed-on: http://review.couchbase.org/c/eventing/+/146523
Tested-by: Vinayaka Kamath <vinayaka.kamath@couchbase.com>
Reviewed-by: Jeelan Basha Poola <jeelan.poola@couchbase.com>
(cherry picked from commit 5f72fce)
Reviewed-on: http://review.couchbase.org/c/eventing/+/146327
Well-Formed: Build Bot <build@couchbase.com>
  • Loading branch information
Vinayaka R Kamath committed Feb 19, 2021
1 parent 1a8e981 commit 81c9908
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
9 changes: 4 additions & 5 deletions ui/eventing-ui/ui-current/dialogs/app-actions.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,15 @@ <h2>Confirm {{actionTitle}} Function</h2>
<div class="formrow">
Feed boundary:
<span class="fa-stack icon-info"
uib-tooltip="The preferred Deployment time Feed Boundary for the function can be changed under the settings."
uib-tooltip="The preferred Deployment time Feed Boundary for the function can be changed under the function level settings."
tooltip-placement="right">
<span class="icon fa-circle-thin fa-stack-2x"></span>
<span class="icon fa-info fa-stack-1x"></span>
</span>
<br>
<select ng-model="settings.changeFeedBoundary" disabled>
<option value="everything">Everything</option>
<option value="from_now">From now</option>
</select>
<!-- TODO: replace the below input text with a READ ONLY UI element after UI team designs one -->
<input class="input-short-1" style="width: 30%; margin-top: 0.5em;" type="text" ng-model="settings.changeFeedBoundary == 'from_now'?'From now':'Everything'" disabled>
</input>
</div>
</div>
<!--Pause action-->
Expand Down
5 changes: 3 additions & 2 deletions ui/eventing-ui/ui-current/fragments/app-settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ <h2 ng-show="!formCtrl.isDialog">Function Settings</h2>
<select name="dcp_stream_boundary"
ng-init="appModel.settings.dcp_stream_boundary = appModel.settings.dcp_stream_boundary ?
( appModel.settings.dcp_stream_boundary === 'from_prior' ? 'everything' : appModel.settings.dcp_stream_boundary ) : 'everything'"
ng-model="appModel.settings.dcp_stream_boundary">
ng-model="appModel.settings.dcp_stream_boundary"
ng-disabled="!(appModel.status == 'undeployed')">
<option value="everything">Everything</option>
<option value="from_now">From now</option>
</select>
Expand Down Expand Up @@ -237,7 +238,7 @@ <h2 ng-show="!formCtrl.isDialog">Function Settings</h2>
<label class="inline"> Timer Context Max Size</label>
<span
class="fa-stack icon-info"
uib-tooltip="Maximum allowed value of the Timer Context Size in Bytes."
uib-tooltip="Maximum allowed value of the Timer Context Size in Bytes. Takes effect immediately.""
tooltip-placement="right">
<span class="icon fa-circle-thin fa-stack-2x"></span>
<span class="icon fa-info fa-stack-1x"></span>
Expand Down

0 comments on commit 81c9908

Please sign in to comment.