Skip to content

Commit

Permalink
dynamically set router based on owner
Browse files Browse the repository at this point in the history
  • Loading branch information
hellobontempo committed Oct 4, 2024
1 parent 81087dc commit 9efe568
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 14 deletions.
11 changes: 9 additions & 2 deletions ui/lib/core/addon/components/linked-block.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import Component from '@glimmer/component';
import { service } from '@ember/service';
import { getOwner } from '@ember/application';
import { action } from '@ember/object';
import { encodePath } from 'vault/utils/path-encoding-helpers';

Expand All @@ -26,7 +26,14 @@ import { encodePath } from 'vault/utils/path-encoding-helpers';
*/

export default class LinkedBlockComponent extends Component {
@service router;
// We don't import the router service here because Ember Engine's use the alias 'app-router'
// Since this component is shared across engines, we look up the router dynamically using getOwner instead.
// This way we avoid throwing an error by looking up a service that doesn't exist.
// https://guides.emberjs.com/release/services/#toc_accessing-services
get router() {
const owner = getOwner(this);
return owner.lookup('service:router') || owner.lookup('service:app-router');
}

@action
onClick(event) {
Expand Down
31 changes: 31 additions & 0 deletions ui/lib/core/addon/helpers/transition-to.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/**
* Copyright (c) HashiCorp, Inc.
* SPDX-License-Identifier: BUSL-1.1
*/

import Helper from '@ember/component/helper';
import { getOwner } from '@ember/application';

/*
template helper that replaces ember-router-helpers https://github.com/rwjblue/ember-router-helpers
example:
<MyForm @onSave={{transition-to "vault.cluster.some.route.item" "item-id"}} />
<MyForm @onSave={{transition-to "vault.cluster.some.external.route" external=true}} />
*/
export default class TransitionTo extends Helper {
// We don't import the router service here because Ember Engine's use the alias 'app-router'
// Since this helper is shared across engines, we look up the router dynamically using getOwner instead.
// This way we avoid throwing an error by looking up a service that doesn't exist.
// https://guides.emberjs.com/release/services/#toc_accessing-services
get router() {
const owner = getOwner(this);
return owner.lookup('service:router') || owner.lookup('service:app-router');
}

compute(routeParams, { external = false }) {
if (external) {
return () => this.router.transitionToExternal(...routeParams);
}
return () => this.router.transitionTo(...routeParams);
}
}
6 changes: 6 additions & 0 deletions ui/lib/core/app/helpers/transition-to.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/**
* Copyright (c) HashiCorp, Inc.
* SPDX-License-Identifier: BUSL-1.1
*/

export { default } from 'core/helpers/transition-to';
1 change: 0 additions & 1 deletion ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@
"ember-qunit": "^8.0.1",
"ember-resolver": "^11.0.1",
"ember-responsive": "5.0.0",
"ember-router-helpers": "^0.4.0",
"ember-service-worker": "meirish/ember-service-worker#configurable-scope",
"ember-sinon-qunit": "^7.4.0",
"ember-source": "~5.4.0",
Expand Down
12 changes: 1 addition & 11 deletions ui/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7607,7 +7607,7 @@ __metadata:
languageName: node
linkType: hard

"ember-cli-babel@npm:^7.1.2, ember-cli-babel@npm:^7.1.3, ember-cli-babel@npm:^7.10.0, ember-cli-babel@npm:^7.13.0, ember-cli-babel@npm:^7.18.0, ember-cli-babel@npm:^7.20.0, ember-cli-babel@npm:^7.22.1, ember-cli-babel@npm:^7.23.0, ember-cli-babel@npm:^7.26.11, ember-cli-babel@npm:^7.26.3, ember-cli-babel@npm:^7.26.4, ember-cli-babel@npm:^7.26.5, ember-cli-babel@npm:^7.26.6, ember-cli-babel@npm:^7.26.8, ember-cli-babel@npm:^7.5.0, ember-cli-babel@npm:^7.7.3":
"ember-cli-babel@npm:^7.1.2, ember-cli-babel@npm:^7.1.3, ember-cli-babel@npm:^7.10.0, ember-cli-babel@npm:^7.13.0, ember-cli-babel@npm:^7.18.0, ember-cli-babel@npm:^7.22.1, ember-cli-babel@npm:^7.23.0, ember-cli-babel@npm:^7.26.11, ember-cli-babel@npm:^7.26.3, ember-cli-babel@npm:^7.26.4, ember-cli-babel@npm:^7.26.5, ember-cli-babel@npm:^7.26.6, ember-cli-babel@npm:^7.26.8, ember-cli-babel@npm:^7.5.0, ember-cli-babel@npm:^7.7.3":
version: 7.26.11
resolution: "ember-cli-babel@npm:7.26.11"
dependencies:
Expand Down Expand Up @@ -8663,15 +8663,6 @@ __metadata:
languageName: node
linkType: hard

"ember-router-helpers@npm:^0.4.0":
version: 0.4.0
resolution: "ember-router-helpers@npm:0.4.0"
dependencies:
ember-cli-babel: ^7.20.0
checksum: e847ceb1061f87416d6bb5d72ef539fda738a24086051bc94d740117c6353b3406c65247ac8190b8572df008a70d9f801e224d38489170129c5ca6c4ec7f206e
languageName: node
linkType: hard

"ember-service-worker@meirish/ember-service-worker#configurable-scope":
version: 9.0.1
resolution: "ember-service-worker@https://github.com/meirish/ember-service-worker.git#commit=dda14187aace0d73ecdb6a55beac2194a3aec01b"
Expand Down Expand Up @@ -18840,7 +18831,6 @@ __metadata:
ember-qunit: ^8.0.1
ember-resolver: ^11.0.1
ember-responsive: 5.0.0
ember-router-helpers: ^0.4.0
ember-service-worker: "meirish/ember-service-worker#configurable-scope"
ember-sinon-qunit: ^7.4.0
ember-source: ~5.4.0
Expand Down

0 comments on commit 9efe568

Please sign in to comment.