diff --git a/addons/core/README.md b/addons/core/README.md index 1b0dd33e9..3f84d7d03 100644 --- a/addons/core/README.md +++ b/addons/core/README.md @@ -83,6 +83,25 @@ update the confirmation status. +``` + +## Loading Helper + +To make use of the `is-loading` helper, install `ember-loading` first. + ## Yarn Commands List of available project commands. `yarn run ` diff --git a/ui/admin/app/components/doc-link/index.hbs b/addons/core/addon/components/doc-link/index.hbs similarity index 100% rename from ui/admin/app/components/doc-link/index.hbs rename to addons/core/addon/components/doc-link/index.hbs diff --git a/ui/admin/app/helpers/app-name.js b/addons/core/addon/helpers/app-name.js similarity index 73% rename from ui/admin/app/helpers/app-name.js rename to addons/core/addon/helpers/app-name.js index ed1e479bb..a45e86cc6 100644 --- a/ui/admin/app/helpers/app-name.js +++ b/addons/core/addon/helpers/app-name.js @@ -1,5 +1,5 @@ import { helper } from '@ember/component/helper'; -import config from '../config/environment'; +import config from 'ember-get-config'; export default helper(function appName() { return config.appName; diff --git a/ui/admin/app/helpers/company-copyright.js b/addons/core/addon/helpers/company-copyright.js similarity index 82% rename from ui/admin/app/helpers/company-copyright.js rename to addons/core/addon/helpers/company-copyright.js index f4e799954..26154cf22 100644 --- a/ui/admin/app/helpers/company-copyright.js +++ b/addons/core/addon/helpers/company-copyright.js @@ -1,5 +1,5 @@ import { helper } from '@ember/component/helper'; -import config from '../config/environment'; +import config from 'ember-get-config'; export default helper(function companyCopyright() { const currentYear = new Date().getFullYear(); diff --git a/ui/admin/app/helpers/company-name.js b/addons/core/addon/helpers/company-name.js similarity index 74% rename from ui/admin/app/helpers/company-name.js rename to addons/core/addon/helpers/company-name.js index 78d99f2e7..8fda6bc78 100644 --- a/ui/admin/app/helpers/company-name.js +++ b/addons/core/addon/helpers/company-name.js @@ -1,5 +1,5 @@ import { helper } from '@ember/component/helper'; -import config from '../config/environment'; +import config from 'ember-get-config'; export default helper(function companyName() { return config.companyName; diff --git a/ui/admin/app/helpers/doc-url.js b/addons/core/addon/helpers/doc-url.js similarity index 92% rename from ui/admin/app/helpers/doc-url.js rename to addons/core/addon/helpers/doc-url.js index a0915bb9e..563b67a44 100644 --- a/ui/admin/app/helpers/doc-url.js +++ b/addons/core/addon/helpers/doc-url.js @@ -1,6 +1,6 @@ import { helper } from '@ember/component/helper'; import { assert } from '@ember/debug'; -import config from '../config/environment'; +import config from 'ember-get-config'; export default helper(function docUrl(params /*, hash*/) { const baseURL = config.documentation.baseURL; diff --git a/ui/admin/app/helpers/is-loading.js b/addons/core/addon/helpers/is-loading.js similarity index 100% rename from ui/admin/app/helpers/is-loading.js rename to addons/core/addon/helpers/is-loading.js diff --git a/addons/core/app/components/doc-link.js b/addons/core/app/components/doc-link.js new file mode 100644 index 000000000..d495e84f1 --- /dev/null +++ b/addons/core/app/components/doc-link.js @@ -0,0 +1 @@ +export { default } from 'core/components/doc-link'; diff --git a/addons/core/app/helpers/app-name.js b/addons/core/app/helpers/app-name.js new file mode 100644 index 000000000..ee117ad2f --- /dev/null +++ b/addons/core/app/helpers/app-name.js @@ -0,0 +1 @@ +export { default, appName } from 'core/helpers/app-name'; diff --git a/addons/core/app/helpers/company-copyright.js b/addons/core/app/helpers/company-copyright.js new file mode 100644 index 000000000..d76da80c8 --- /dev/null +++ b/addons/core/app/helpers/company-copyright.js @@ -0,0 +1 @@ +export { default, companyCopyright } from 'core/helpers/company-copyright'; diff --git a/addons/core/app/helpers/company-name.js b/addons/core/app/helpers/company-name.js new file mode 100644 index 000000000..da699e089 --- /dev/null +++ b/addons/core/app/helpers/company-name.js @@ -0,0 +1 @@ +export { default, companyName } from 'core/helpers/company-name'; diff --git a/addons/core/app/helpers/doc-url.js b/addons/core/app/helpers/doc-url.js new file mode 100644 index 000000000..a8f150ce1 --- /dev/null +++ b/addons/core/app/helpers/doc-url.js @@ -0,0 +1 @@ +export { default, docUrl } from 'core/helpers/doc-url'; diff --git a/addons/core/app/helpers/is-loading.js b/addons/core/app/helpers/is-loading.js new file mode 100644 index 000000000..0645984c8 --- /dev/null +++ b/addons/core/app/helpers/is-loading.js @@ -0,0 +1 @@ +export { default, isLoading } from 'core/helpers/is-loading'; diff --git a/addons/core/package.json b/addons/core/package.json index 0da7c1547..f6961fa16 100644 --- a/addons/core/package.json +++ b/addons/core/package.json @@ -59,7 +59,8 @@ "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", "prettier": "^2.1.2", - "qunit-dom": "^1.2.0" + "qunit-dom": "^1.2.0", + "rose": "*" }, "engines": { "node": "10.* || >= 12" diff --git a/addons/core/tests/dummy/config/environment.js b/addons/core/tests/dummy/config/environment.js index f0a6c3b29..529a24c47 100644 --- a/addons/core/tests/dummy/config/environment.js +++ b/addons/core/tests/dummy/config/environment.js @@ -21,6 +21,16 @@ module.exports = function (environment) { // Here you can pass flags/options to your application instance // when it is created }, + + appName: 'App Name', + companyName: 'Company Name', + + documentation: { + baseURL: 'https://boundaryproject.io/help/admin-ui', + topics: { + account: '/accounts', + } + } }; if (environment === "development") { diff --git a/ui/admin/tests/integration/components/doc-link-test.js b/addons/core/tests/integration/components/doc-link.js similarity index 100% rename from ui/admin/tests/integration/components/doc-link-test.js rename to addons/core/tests/integration/components/doc-link.js diff --git a/ui/admin/tests/integration/helpers/app-name-test.js b/addons/core/tests/integration/helpers/app-name-test.js similarity index 85% rename from ui/admin/tests/integration/helpers/app-name-test.js rename to addons/core/tests/integration/helpers/app-name-test.js index cd86480cf..e12d9e19a 100644 --- a/ui/admin/tests/integration/helpers/app-name-test.js +++ b/addons/core/tests/integration/helpers/app-name-test.js @@ -9,6 +9,6 @@ module('Integration | Helper | app-name', function (hooks) { test('it renders', async function (assert) { assert.expect(1); await render(hbs`{{app-name}}`); - assert.equal(this.element.textContent.trim(), 'Boundary'); + assert.equal(this.element.textContent.trim(), 'App Name'); }); }); diff --git a/ui/admin/tests/integration/helpers/company-copyright-test.js b/addons/core/tests/integration/helpers/company-copyright-test.js similarity index 96% rename from ui/admin/tests/integration/helpers/company-copyright-test.js rename to addons/core/tests/integration/helpers/company-copyright-test.js index 87b468e2f..3025f34a1 100644 --- a/ui/admin/tests/integration/helpers/company-copyright-test.js +++ b/addons/core/tests/integration/helpers/company-copyright-test.js @@ -10,6 +10,6 @@ module('Integration | Helper | company-copyright', function (hooks) { assert.expect(1); const currentYear = new Date().getFullYear(); await render(hbs`{{company-copyright}}`); - assert.equal(this.element.textContent.trim(), `© ${currentYear} HashiCorp`); + assert.equal(this.element.textContent.trim(), `© ${currentYear} Company Name`); }); }); diff --git a/ui/admin/tests/integration/helpers/company-name-test.js b/addons/core/tests/integration/helpers/company-name-test.js similarity index 85% rename from ui/admin/tests/integration/helpers/company-name-test.js rename to addons/core/tests/integration/helpers/company-name-test.js index 0599a936e..e34ef582b 100644 --- a/ui/admin/tests/integration/helpers/company-name-test.js +++ b/addons/core/tests/integration/helpers/company-name-test.js @@ -9,6 +9,6 @@ module('Integration | Helper | company-name', function (hooks) { test('it renders', async function (assert) { assert.expect(1); await render(hbs`{{company-name}}`); - assert.equal(this.element.textContent.trim(), 'HashiCorp'); + assert.equal(this.element.textContent.trim(), 'Company Name'); }); }); diff --git a/ui/admin/tests/integration/helpers/doc-url-test.js b/addons/core/tests/integration/helpers/doc-url-test.js similarity index 100% rename from ui/admin/tests/integration/helpers/doc-url-test.js rename to addons/core/tests/integration/helpers/doc-url-test.js