iguazio.dashboard-controls 1.2.13 → 1.2.15

package/src/nuclio/functions/version/version-execution-log/version-execution-log.tpl.html

@@ -28,8 +28,7 @@
                                       data-type="control"
                                       data-rule-type="message"
                                       data-search-states="$ctrl.searchStates"
-                                      data-search-callback="$ctrl.onQueryChanged(searchQuery, ruleType)"
-                                      data-on-search-submit="$ctrl.applyFilters()">
+                                      data-search-callback="$ctrl.onQueryChanged(searchQuery, ruleType)">
                     </igz-search-input>
                 </div>
 
@@ -95,9 +94,20 @@
                     <span class="filter-label asterisk">
                         {{ 'common:REPLICAS' | i18next }}
                     </span>
+                    <div class="online-replicas__checkbox">
+                        <input type="checkbox"
+                               id="onlineOnly"
+                               data-ng-change="$ctrl.onExcludeOfflineChange()"
+                               data-ng-disabled="$ctrl.excludeOfflineIsDisabled"
+                               data-ng-model="$ctrl.excludeOffline">
+                        <label for="onlineOnly" data-uib-tooltip="{{ $ctrl.excludeOfflineIsDisabled ? 'functions:TOOLTIP.NO_OFFLINE_REPLICAS' : '' | i18next }}">
+                            {{ 'functions:SHOWN_ONLINE_ONLY' | i18next }}
+                        </label>
+                    </div>
                     <igz-multiple-checkboxes data-ng-model="$ctrl.selectedReplicas"
                                              data-options="$ctrl.replicasList"
                                              data-dropdown="true"
+                                             data-title="{{ 'functions:PLACEHOLDER.SELECT_REPLICA' | i18next }}"
                                              data-select-all-none="true"
                                              data-ng-change="$ctrl.onCheckboxChange($event)"
                                              data-ng-required="true"
@@ -125,8 +135,7 @@
                             <div class="actions-bar-left">
                                 <igz-action-item-refresh
                                         data-is-disabled="$ctrl.isFunctionDeploying()"
-
-                                        data-refresh="$ctrl.searchWithParams($ctrl.page.number, $ctrl.page.size)">
+                                        data-refresh="$ctrl.refreshLogs()">
                                 </igz-action-item-refresh>
                             </div>
                             <div class="actions-bar-left">
@@ -154,7 +163,7 @@
                 <div class="control-panel-log-table common-table">
                     <div class="search-input-not-found"
                          data-ng-if="$ctrl.logs.length === 0">
-                        {{ 'functions:NO_LOGS_HAVE_BEEN_FOUND' | i18next }}
+                        {{ 'functions:NO_LOGS_WERE_FOUND' | i18next }}
                     </div>
 
                     <div data-igz-extend-background

package/src/nuclio/functions/version/version.component.js

@@ -35,13 +35,12 @@ such restriction.
             controller: NclVersionController
         });
 
-    function NclVersionController($i18next, $interval, $injector, $rootScope, $scope, $state, $stateParams, $transitions, $timeout,
+    function NclVersionController($i18next, $interval, $rootScope, $scope, $state, $stateParams, $transitions, $timeout,
                                   i18next, lodash, ngDialog, ConfigService, DialogsService, ExportService,
                                   FunctionsService, GeneralDataService, NuclioHeaderService,
                                   VersionHelperService) {
         var ctrl = this;
         var deregisterFunction = null;
-        var servicesService = null;
         var interval = null;
         var lng = i18next.language;
 
@@ -228,10 +227,6 @@ such restriction.
                 }
             });
 
-            if ($injector.has('ServicesService')) {
-                servicesService = $injector.get('ServicesService')
-            }
-
             setImageNamePrefixTemplate();
             setIngressHost();
             initLogTabs();
@@ -687,18 +682,11 @@ such restriction.
          * Checks if the "Execution log" tab should be shown
          */
         function initLogTabs() {
-            if (lodash.get(ConfigService, 'url.elasticsearch.path', '') && servicesService) {
-                servicesService.getServices().then(function (result) {
-                    var services = result.services;
-                    var logForwarderService = lodash.find(services, ['spec.name', 'log-forwarder']);
-
-                    if (servicesService.isEnabled(logForwarderService)) {
-                        ctrl.navigationTabsConfig.push({
-                            tabName: $i18next.t('functions:EXECUTION_LOG', { lng: lng }),
-                            id: 'execution-log',
-                            uiRoute: 'app.project.function.edit.execution-log'
-                        });
-                    }
+            if (lodash.get(ConfigService, 'nuclio.defaultProxyLogsSource', '') === 'elasticsearch') {
+                ctrl.navigationTabsConfig.push({
+                    tabName: $i18next.t('functions:EXECUTION_LOG', { lng: lng }),
+                    id: 'execution-log',
+                    uiRoute: 'app.project.function.edit.execution-log'
                 });
             }
         }