iguazio.dashboard-controls 1.0.1 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iguazio.dashboard-controls",
-    "version": "1.0.1",
+    "version": "1.0.3",
     "main": "dist/js/iguazio.dashboard-controls.js",
     "description": "Collection of resources (such as CSS styles, fonts and images) and AngularJs 1.x components and services to share among different Iguazio repos.",
     "repository": {

package/src/i18n/en/common.json

@@ -4,8 +4,8 @@
     "ACTIVE": "Active",
     "ADD": "Add",
     "ADD_DESCRIPTION": "Add a description...",
-    "ADD_NEW_ENTRY": "Add a new entry",
-    "ADD_NEW_ENVIRONMENT_VARIABLE": "Add a new environment variable",
+    "ADD_ENTRY": "Add an entry",
+    "ADD_ENVIRONMENT_VARIABLE": "Add an environment variable",
     "ADDED": "Added",
     "ADDRESS": "Address",
     "ADVANCED": "Advanced",

package/src/i18n/en/functions.json

@@ -4,12 +4,12 @@
     "ACCESS_KEY_ID": "Access key ID",
     "ACCESS_KEY_V3IO_ONLY": "Access key (required for an Iguazio Data Science Platform download)",
     "ADD_BROKER": "Add broker",
-    "ADD_NEW_ANNOTATION": "Add a new annotation",
-    "ADD_NEW_EVENT_HEADER": "Add a new event header",
-    "ADD_NEW_LABEL": "Add a new label",
-    "ADD_NEW_SUBSCRIPTION": "Add a new subscription",
-    "ADD_NEW_TRIGGER": "Add a new trigger",
-    "ADD_NEW_VOLUME": "Add a new volume",
+    "ADD_ANNOTATION": "Add an annotation",
+    "ADD_EVENT_HEADER": "Add an event header",
+    "ADD_LABEL": "Add a label",
+    "ADD_SUBSCRIPTION": "Add a subscription",
+    "ADD_TRIGGER": "Add a trigger",
+    "ADD_VOLUME": "Add a volume",
     "ADD_TOPIC": "Add topic",
     "ALWAYS_WAIT_FOR_READINESS_TIMEOUT_EXPIRATION": "Always wait for readiness-timeout expiration",
     "ANNOTATIONS": "Annotations",
@@ -58,7 +58,6 @@
     "CREATE_FUNCTION_EVENT": "Create function event",
     "CREATE_NEW_API_GATEWAY": "Create a new API Gateway",
     "CREATE_NEW_BINDING": "Create a new binding",
-    "CREATE_NEW_ENVIRONMENT_VARIABLE": "Create a new environment variable",
     "CREATE_NEW_HEADER": "Create a new header",
     "CREATE_NEW_HOST": "Create a new host",
     "CREATE_NEW_RUNTIME_ATTRIBUTE": "Create a new runtime attribute",

package/src/igz_controls/components/pagination/pagination.controller.js

@@ -22,7 +22,7 @@ such restriction.
     /*eslint no-shadow: 0*/
     function PaginationController($i18next, $injector , $location, $q, $rootScope, $stateParams, $timeout,
                                   i18next, lodash, ActionCheckboxAllService, GeneralDataService, PaginationService,
-                                  entitiesType, onChangePageCallback, dataServiceName, vm, emptyOnPageChange) {
+                                  entitiesType, onChangePageCallback, dataServiceName, vm, emptyOnPageChange, customErrors) {
 
         // entityId - id of nested entity
         var entityId = lodash.defaultTo($location.search().entityId, $stateParams.id);
@@ -151,11 +151,16 @@ such restriction.
                             '500': $i18next.t('common:ERROR_MSG.ERROR_ON_SERVER_SIDE', { lng: lng }),
                             'default': $i18next.t('common:ERROR_MSG.UNKNOWN_ERROR', { lng: lng })
                         };
-                        var message = lodash.get(errorMessages, String(error.status), errorMessages.default);
+                        var errorMessage = lodash.get(errorMessages, String(error.status), errorMessages.default) +
+                                           ' ' + $i18next.t('common:ERROR_MSG.YOU_CAN_TRY_TO_REFRESH_PAGE', { lng: lng });
 
-                        $rootScope.$broadcast('splash-screen_show-error', {
-                            alertText: message + ' ' + $i18next.t('common:ERROR_MSG.YOU_CAN_TRY_TO_REFRESH_PAGE', { lng: lng })
-                        });
+                        $q.when(customErrors).then(function (customErrorMessages) {
+                            var message = lodash.get(customErrorMessages, String(error.status), errorMessage);
+
+                            $rootScope.$broadcast('splash-screen_show-error', {
+                                alertText: message
+                            });
+                        })
                     }
                 });
         }

package/src/igz_controls/components/pagination/pagination.service.js

@@ -38,14 +38,16 @@ such restriction.
          * @param {string} [dataServiceName] Name of DataService
          * @param {function} [onChangePageCallback] Additional code that should be executed after page changed
          * @param {boolean} [emptyOnPageChange=true] Set to `false` to prevent list from emptying before repopulating
+         * @param {Promise.<Object> | Object} [customErrors] List of custom errors messages
          */
-        function addPagination(controller, entitiesType, dataServiceName, onChangePageCallback, emptyOnPageChange) {
+        function addPagination(controller, entitiesType, dataServiceName, onChangePageCallback, emptyOnPageChange, customErrors) {
             $controller('PaginationController', {
                 entitiesType: entitiesType,
                 onChangePageCallback: onChangePageCallback,
                 dataServiceName: dataServiceName,
                 vm: controller,
-                emptyOnPageChange: emptyOnPageChange
+                emptyOnPageChange: emptyOnPageChange,
+                customErrors: customErrors
             });
         }
 

package/src/nuclio/common/components/edit-item/edit-item.tpl.html

@@ -337,7 +337,7 @@
                      data-ng-class="{'disabled': $ctrl.readOnly}"
                      data-ng-click="$ctrl.addNewAnnotation($event)">
                     <span class="igz-icon-add-round"></span>
-                    {{ 'functions:ADD_NEW_ANNOTATION' | i18next }}
+                    {{ 'functions:ADD_ANNOTATION' | i18next }}
                 </div>
             </div>
 
@@ -368,7 +368,7 @@
                      data-ng-class="{'disabled': $ctrl.readOnly}"
                      data-ng-click="$ctrl.addNewEventHeader($event)">
                     <span class="igz-icon-add-round"></span>
-                    {{ 'functions:ADD_NEW_EVENT_HEADER' | i18next }}
+                    {{ 'functions:ADD_EVENT_HEADER' | i18next }}
                 </div>
             </div>
 
@@ -399,7 +399,7 @@
                      data-ng-class="{'disabled': $ctrl.readOnly}"
                      data-ng-click="$ctrl.addNewSubscription($event)">
                     <span class="igz-icon-add-round"></span>
-                    {{ 'functions:ADD_NEW_SUBSCRIPTION' | i18next }}
+                    {{ 'functions:ADD_SUBSCRIPTION' | i18next }}
                 </div>
             </div>
 

package/src/nuclio/functions/version/version-configuration/tabs/version-configuration-annotations/version-configuration-annotations.tpl.html

@@ -42,7 +42,7 @@
              data-ng-class="{'disabled': $ctrl.isFunctionDeploying()}"
              data-ng-click="$ctrl.addNewAnnotation($event)">
             <span class="igz-icon-add-round"></span>
-            {{ 'functions:ADD_NEW_ANNOTATION' | i18next }}
+            {{ 'functions:ADD_ANNOTATION' | i18next }}
         </div>
     </form>
 </div>

package/src/nuclio/functions/version/version-configuration/tabs/version-configuration-environment-variables/version-configuration-environment-variables.tpl.html

@@ -26,7 +26,7 @@
              data-ng-class="{ 'disabled': $ctrl.isFunctionDeploying() }"
              data-ng-click="$ctrl.addNewVariable($event)">
             <span class="igz-icon-add-round"></span>
-            {{ 'functions:ADD_NEW_ENVIRONMENT_VARIABLE' | i18next }}
+            {{ 'common:ADD_ENVIRONMENT_VARIABLE' | i18next }}
         </div>
     </form>
 </div>

package/src/nuclio/functions/version/version-configuration/tabs/version-configuration-labels/version-configuration-labels.tpl.html

@@ -48,7 +48,7 @@
              data-tooltip-placement="right"
              data-tooltip-popup-delay="100">
             <span class="igz-icon-add-round"></span>
-            {{ 'functions:ADD_NEW_LABEL' | i18next }}
+            {{ 'functions:ADD_LABEL' | i18next }}
         </div>
     </form>
 </div>

package/src/nuclio/functions/version/version-configuration/tabs/version-configuration-resources/version-configuration-resources.tpl.html

@@ -315,7 +315,7 @@
                      data-ng-class="{ 'disabled': $ctrl.isFunctionDeploying() }"
                      data-ng-click="$ctrl.addNewNodeSelector($event)">
                     <span class="igz-icon-add-round"></span>
-                    {{ 'common:ADD_NEW_ENTRY' | i18next }}
+                    {{ 'common:ADD_ENTRY' | i18next }}
                 </div>
             </div>
         </div>

package/src/nuclio/functions/version/version-configuration/tabs/version-configuration-volumes/version-configuration-volumes.tpl.html

@@ -52,7 +52,7 @@
              data-ng-class="{'disabled': $ctrl.isFunctionDeploying()}"
              data-ng-click="$ctrl.createVolume($event)">
             <span class="igz-icon-add-round"></span>
-            {{ 'functions:ADD_NEW_VOLUME' | i18next }}
+            {{ 'functions:ADD_VOLUME' | i18next }}
         </div>
     </form>
 </div>

package/src/nuclio/functions/version/version-triggers/version-triggers.tpl.html

@@ -45,7 +45,7 @@
                      data-ng-if="$ctrl.isCreateNewTriggerEnabled()"
                      data-ng-click="$ctrl.createTrigger($event)">
                     <span class="igz-icon-add-round"></span>
-                    {{ 'functions:ADD_NEW_TRIGGER' | i18next }}
+                    {{ 'functions:ADD_TRIGGER' | i18next }}
                 </div>
             </div>
         </div>

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

@@ -404,6 +404,7 @@ such restriction.
                     setVersion(aFunction);
                     setImageNamePrefixTemplate();
                     setIngressHost();
+                    updateStatusTabIndicator();
                 })
                 .catch(function (error) {
                     if (!GeneralDataService.isDisconnectionError(error.status)) {