ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-9262 Revert wrong commit.
Date Wed, 22 Aug 2018 09:52:18 GMT
Repository: ignite
Updated Branches:
  refs/heads/master 89770383d -> c43876e03


IGNITE-9262 Revert wrong commit.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c43876e0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c43876e0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c43876e0

Branch: refs/heads/master
Commit: c43876e03d02367c89d5adc0e51fea87c1ce11b2
Parents: 8977038
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Wed Aug 22 16:52:02 2018 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Wed Aug 22 16:52:02 2018 +0700

----------------------------------------------------------------------
 .../services/ConfigurationResource.js           |  4 +-
 .../services/ConfigurationResource.spec.js      | 78 --------------------
 2 files changed, 1 insertion(+), 81 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/c43876e0/modules/web-console/frontend/app/components/page-configure/services/ConfigurationResource.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-configure/services/ConfigurationResource.js
b/modules/web-console/frontend/app/components/page-configure/services/ConfigurationResource.js
index 269eb93..2dab8a3 100644
--- a/modules/web-console/frontend/app/components/page-configure/services/ConfigurationResource.js
+++ b/modules/web-console/frontend/app/components/page-configure/services/ConfigurationResource.js
@@ -27,9 +27,7 @@ export default function ConfigurationResourceService($http) {
                 .then(({data}) => data)
                 .catch(({data}) => Promise.reject(data));
         },
-        populate(data) {
-            const {spaces, clusters, caches, igfss, domains} = _.cloneDeep(data);
-
+        populate({spaces, clusters, caches, igfss, domains}) {
             _.forEach(clusters, (cluster) => {
                 cluster.caches = _.filter(caches, ({_id}) => _.includes(cluster.caches,
_id));
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c43876e0/modules/web-console/frontend/app/components/page-configure/services/ConfigurationResource.spec.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-configure/services/ConfigurationResource.spec.js
b/modules/web-console/frontend/app/components/page-configure/services/ConfigurationResource.spec.js
deleted file mode 100644
index d52d94a..0000000
--- a/modules/web-console/frontend/app/components/page-configure/services/ConfigurationResource.spec.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import configurationResource from './ConfigurationResource';
-
-import { suite, test } from 'mocha';
-import { assert } from 'chai';
-
-const CHECKED_CONFIGURATION = {
-    spaces: [{
-        _id: '1space',
-        name: 'Test space'
-    }],
-    clusters: [{
-        _id: '1cluster',
-        space: '1space',
-        name: 'Test cluster',
-        caches: ['1cache'],
-        models: ['1model'],
-        igfss: ['1igfs']
-    }],
-    caches: [{
-        _id: '1cache',
-        space: '1space',
-        name: 'Test cache',
-        clusters: ['1cluster'],
-        models: ['1model']
-    }],
-    domains: [{
-        _id: '1model',
-        space: '1space',
-        name: 'Test model',
-        clusters: ['1cluster'],
-        caches: ['1cache']
-    }],
-    igfss: [{
-        _id: '1igfs',
-        space: '1space',
-        name: 'Test IGFS',
-        clusters: ['1cluster']
-    }]
-};
-
-suite('ConfigurationResourceTestsSuite', () => {
-    test('ConfigurationResourceService correctly populate data', async() => {
-        const service = configurationResource(null);
-        const converted = _.cloneDeep(CHECKED_CONFIGURATION);
-        const res = await service.populate(converted);
-
-        assert.notEqual(res.clusters[0], converted.clusters[0]);
-
-        assert.deepEqual(converted.clusters[0].caches, CHECKED_CONFIGURATION.clusters[0].caches);
-        assert.deepEqual(converted.clusters[0].models, CHECKED_CONFIGURATION.clusters[0].models);
-        assert.deepEqual(converted.clusters[0].igfss, CHECKED_CONFIGURATION.clusters[0].igfss);
-
-        assert.deepEqual(converted.caches[0].clusters, CHECKED_CONFIGURATION.caches[0].clusters);
-        assert.deepEqual(converted.caches[0].models, CHECKED_CONFIGURATION.caches[0].models);
-
-        assert.deepEqual(converted.domains[0].clusters, CHECKED_CONFIGURATION.domains[0].clusters);
-        assert.deepEqual(converted.domains[0].caches, CHECKED_CONFIGURATION.domains[0].caches);
-
-        assert.deepEqual(converted.igfss[0].clusters, CHECKED_CONFIGURATION.igfss[0].clusters);
-    });
-});


Mime
View raw message