提交 4ec7c60c 编写于 作者: S Sebastian Florek

Refactor breadcrumbs configuration to use explicit string

上级 e68577b6
...@@ -14,6 +14,9 @@ ...@@ -14,6 +14,9 @@
import Breadcrumb from './breadcrumb'; import Breadcrumb from './breadcrumb';
/** Breadcrumbs config string used on state config. **/
export const breadcrumbsConfig = 'kdBreadcrumbs';
/** /**
* @final * @final
*/ */
...@@ -93,7 +96,7 @@ export default class BreadcrumbsController { ...@@ -93,7 +96,7 @@ export default class BreadcrumbsController {
let conf = state['data']; let conf = state['data'];
if (conf) { if (conf) {
conf = conf['kdBreadcrumbs']; conf = conf[breadcrumbsConfig];
} }
return conf; return conf;
......
...@@ -13,8 +13,9 @@ ...@@ -13,8 +13,9 @@
// limitations under the License. // limitations under the License.
import {actionbarViewName} from 'chrome/chrome_state'; import {actionbarViewName} from 'chrome/chrome_state';
import {stateName, stateUrl} from './replicasetlist_state'; import {breadcrumbsConfig} from 'common/components/breadcrumbs/breadcrumbs_component';
import {ReplicaSetListController} from './replicasetlist_controller'; import {ReplicaSetListController} from './replicasetlist_controller';
import {stateName, stateUrl} from './replicasetlist_state';
import ReplicaSetListActionBarController from './replicasetlistactionbar_controller'; import ReplicaSetListActionBarController from './replicasetlistactionbar_controller';
/** /**
...@@ -30,7 +31,7 @@ export default function stateConfig($stateProvider) { ...@@ -30,7 +31,7 @@ export default function stateConfig($stateProvider) {
'replicaSets': resolveReplicaSets, 'replicaSets': resolveReplicaSets,
}, },
data: { data: {
'kdBreadcrumbs': { [breadcrumbsConfig]: {
'label': 'Replica Sets', 'label': 'Replica Sets',
}, },
}, },
......
...@@ -12,11 +12,12 @@ ...@@ -12,11 +12,12 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
import ReplicationControllerDetailController from './replicationcontrollerdetail_controller';
import ReplicationControllerDetailActionBarController from './replicationcontrollerdetailactionbar_controller';
import {stateName} from './replicationcontrollerdetail_state';
import {actionbarViewName} from 'chrome/chrome_state'; import {actionbarViewName} from 'chrome/chrome_state';
import {breadcrumbsConfig} from 'common/components/breadcrumbs/breadcrumbs_component';
import {stateName} from './replicationcontrollerdetail_state';
import {stateName as replicationControllers} from 'replicationcontrollerlistdeprecated/replicationcontrollerlist_state'; import {stateName as replicationControllers} from 'replicationcontrollerlistdeprecated/replicationcontrollerlist_state';
import ReplicationControllerDetailActionBarController from './replicationcontrollerdetailactionbar_controller';
import ReplicationControllerDetailController from './replicationcontrollerdetail_controller';
/** /**
* Configures states for the service view. * Configures states for the service view.
...@@ -34,7 +35,7 @@ export default function stateConfig($stateProvider) { ...@@ -34,7 +35,7 @@ export default function stateConfig($stateProvider) {
'replicationControllerEvents': resolveReplicationControllerEvents, 'replicationControllerEvents': resolveReplicationControllerEvents,
}, },
data: { data: {
'kdBreadcrumbs': { [breadcrumbsConfig]: {
'label': '{{$stateParams.replicationController}}', 'label': '{{$stateParams.replicationController}}',
'parent': replicationControllers, 'parent': replicationControllers,
}, },
......
...@@ -13,8 +13,9 @@ ...@@ -13,8 +13,9 @@
// limitations under the License. // limitations under the License.
import {actionbarViewName} from 'chrome/chrome_state'; import {actionbarViewName} from 'chrome/chrome_state';
import {stateName, stateUrl} from './replicationcontrollerlist_state'; import {breadcrumbsConfig} from 'common/components/breadcrumbs/breadcrumbs_component';
import {ReplicationControllerListController} from './replicationcontrollerlist_controller'; import {ReplicationControllerListController} from './replicationcontrollerlist_controller';
import {stateName, stateUrl} from './replicationcontrollerlist_state';
import ReplicationControllerListActionBarController from './replicationcontrollerlistactionbar_controller'; import ReplicationControllerListActionBarController from './replicationcontrollerlistactionbar_controller';
/** /**
...@@ -30,7 +31,7 @@ export default function stateConfig($stateProvider) { ...@@ -30,7 +31,7 @@ export default function stateConfig($stateProvider) {
'replicationControllers': resolveReplicationControllers, 'replicationControllers': resolveReplicationControllers,
}, },
data: { data: {
'kdBreadcrumbs': { [breadcrumbsConfig]: {
'label': 'Replication Controllers', 'label': 'Replication Controllers',
}, },
}, },
......
...@@ -13,12 +13,13 @@ ...@@ -13,12 +13,13 @@
// limitations under the License. // limitations under the License.
import {actionbarViewName} from 'chrome/chrome_state'; import {actionbarViewName} from 'chrome/chrome_state';
import {breadcrumbsConfig} from 'common/components/breadcrumbs/breadcrumbs_component';
import {stateName as zerostate} from './zerostate/zerostate_state'; import {stateName as zerostate} from './zerostate/zerostate_state';
import {stateName as replicationcontrollers} from './replicationcontrollerlist_state'; import {stateName as replicationcontrollers} from './replicationcontrollerlist_state';
import {stateUrl as replicationcontrollersUrl} from './replicationcontrollerlist_state'; import {stateUrl as replicationcontrollersUrl} from './replicationcontrollerlist_state';
import {StateParams} from './zerostate/zerostate_state'; import {StateParams} from './zerostate/zerostate_state';
import ReplicationControllerListController from './replicationcontrollerlist_controller';
import ReplicationControllerListActionBarController from './replicationcontrollerlistactionbar_controller'; import ReplicationControllerListActionBarController from './replicationcontrollerlistactionbar_controller';
import ReplicationControllerListController from './replicationcontrollerlist_controller';
import ZeroStateController from './zerostate/zerostate_controller'; import ZeroStateController from './zerostate/zerostate_controller';
/** /**
...@@ -34,7 +35,7 @@ export default function stateConfig($stateProvider) { ...@@ -34,7 +35,7 @@ export default function stateConfig($stateProvider) {
'replicationControllers': resolveReplicationControllers, 'replicationControllers': resolveReplicationControllers,
}, },
data: { data: {
'kdBreadcrumbs': { [breadcrumbsConfig]: {
'label': 'Replication Controllers', 'label': 'Replication Controllers',
}, },
}, },
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
import {breadcrumbsConfig} from 'common/components/breadcrumbs/breadcrumbs_component';
import componentsModule from 'common/components/components_module'; import componentsModule from 'common/components/components_module';
describe('Breadcrumbs controller ', () => { describe('Breadcrumbs controller ', () => {
...@@ -35,7 +36,7 @@ describe('Breadcrumbs controller ', () => { ...@@ -35,7 +36,7 @@ describe('Breadcrumbs controller ', () => {
return { return {
name: stateName, name: stateName,
data: { data: {
kdBreadcrumbs: { [breadcrumbsConfig]: {
label: stateLabel, label: stateLabel,
}, },
}, },
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册