IGNITE-4082 Define filter names in app.js instead of filter definitions.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7297e1dc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7297e1dc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7297e1dc Branch: refs/heads/ignite-5075 Commit: 7297e1dcac183e81336a588a17fc1a706b8075d7 Parents: 25f0f75 Author: Ilya Borisov <[email protected]> Authored: Fri Apr 28 17:09:02 2017 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Fri Apr 28 17:09:02 2017 +0700 ---------------------------------------------------------------------- modules/web-console/frontend/app/app.js | 8 ++++---- modules/web-console/frontend/app/filters/byName.filter.js | 4 ++-- .../frontend/app/filters/domainsValidation.filter.js | 4 ++-- modules/web-console/frontend/app/filters/duration.filter.js | 4 ++-- modules/web-console/frontend/app/filters/hasPojo.filter.js | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7297e1dc/modules/web-console/frontend/app/app.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/app.js b/modules/web-console/frontend/app/app.js index a8460e9..1f87196 100644 --- a/modules/web-console/frontend/app/app.js +++ b/modules/web-console/frontend/app/app.js @@ -226,11 +226,11 @@ angular .controller(...igfs) .controller(...profile) // Filters. -.filter(...byName) +.filter('byName', byName) .filter('defaultName', defaultName) -.filter(...domainsValidation) -.filter(...duration) -.filter(...hasPojo) +.filter('domainsValidation', domainsValidation) +.filter('duration', duration) +.filter('hasPojo', hasPojo) .filter('uiGridSubcategories', uiGridSubcategories) .config(['$translateProvider', '$stateProvider', '$locationProvider', '$urlRouterProvider', ($translateProvider, $stateProvider, $locationProvider, $urlRouterProvider) => { $translateProvider.translations('en', i18n); http://git-wip-us.apache.org/repos/asf/ignite/blob/7297e1dc/modules/web-console/frontend/app/filters/byName.filter.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/filters/byName.filter.js b/modules/web-console/frontend/app/filters/byName.filter.js index 3b0746f..2769189 100644 --- a/modules/web-console/frontend/app/filters/byName.filter.js +++ b/modules/web-console/frontend/app/filters/byName.filter.js @@ -15,9 +15,9 @@ * limitations under the License. */ -export default ['byName', [() => (arr, search) => { +export default [() => (arr, search) => { if (!(arr && arr.length) || !search) return arr; return _.filter(arr, ({ name }) => name.indexOf(search) >= 0); -}]]; +}]; http://git-wip-us.apache.org/repos/asf/ignite/blob/7297e1dc/modules/web-console/frontend/app/filters/domainsValidation.filter.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/filters/domainsValidation.filter.js b/modules/web-console/frontend/app/filters/domainsValidation.filter.js index 1a38392..eec0ff1 100644 --- a/modules/web-console/frontend/app/filters/domainsValidation.filter.js +++ b/modules/web-console/frontend/app/filters/domainsValidation.filter.js @@ -16,7 +16,7 @@ */ // Filter domain models with key fields configuration. -export default ['domainsValidation', ['IgniteLegacyUtils', (LegacyUtils) => (domains, valid, invalid) => { +export default ['IgniteLegacyUtils', (LegacyUtils) => (domains, valid, invalid) => { if (valid && invalid) return domains; @@ -30,4 +30,4 @@ export default ['domainsValidation', ['IgniteLegacyUtils', (LegacyUtils) => (dom }); return out; -}]]; +}]; http://git-wip-us.apache.org/repos/asf/ignite/blob/7297e1dc/modules/web-console/frontend/app/filters/duration.filter.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/filters/duration.filter.js b/modules/web-console/frontend/app/filters/duration.filter.js index 0d7afe6..770bca3 100644 --- a/modules/web-console/frontend/app/filters/duration.filter.js +++ b/modules/web-console/frontend/app/filters/duration.filter.js @@ -15,7 +15,7 @@ * limitations under the License. */ -export default ['duration', [() => { +export default [() => { /** * @param {Number} t Time in ms. */ @@ -38,4 +38,4 @@ export default ['duration', [() => { return a(d, 'd') + a(h, 'h') + a(m, 'm') + a(s, 's') + (t < cm ? ms + 'ms' : ''); }; -}]]; +}]; http://git-wip-us.apache.org/repos/asf/ignite/blob/7297e1dc/modules/web-console/frontend/app/filters/hasPojo.filter.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/filters/hasPojo.filter.js b/modules/web-console/frontend/app/filters/hasPojo.filter.js index ee50051..57530db 100644 --- a/modules/web-console/frontend/app/filters/hasPojo.filter.js +++ b/modules/web-console/frontend/app/filters/hasPojo.filter.js @@ -16,6 +16,6 @@ */ // Filter that return 'true' if caches has at least one domain with 'generatePojo' flag. -export default ['hasPojo', [() => ({caches} = []) => +export default [() => ({caches} = []) => _.find(caches, (cache) => cache.domains && cache.domains.length && - cache.domains.find((domain) => domain.generatePojo))]]; + cache.domains.find((domain) => domain.generatePojo))];
