diff --git a/.changelog/1916.txt b/.changelog/1916.txt new file mode 100644 index 00000000000..6346757ee11 --- /dev/null +++ b/.changelog/1916.txt @@ -0,0 +1,3 @@ +```release-note:improvement +ui: Add dynamic page titles +``` diff --git a/ui/app/templates/application.hbs b/ui/app/templates/application.hbs index 784446245bf..23fe250c403 100644 --- a/ui/app/templates/application.hbs +++ b/ui/app/templates/application.hbs @@ -1,3 +1,4 @@ +{{page-title "Waypoint"}}
diff --git a/ui/app/templates/workspace/projects/index.hbs b/ui/app/templates/workspace/projects/index.hbs index f867086aa03..faccea1722d 100644 --- a/ui/app/templates/workspace/projects/index.hbs +++ b/ui/app/templates/workspace/projects/index.hbs @@ -1,3 +1,5 @@ +{{page-title "Projects"}} + {{#if this.cli}}
diff --git a/ui/app/templates/workspace/projects/new.hbs b/ui/app/templates/workspace/projects/new.hbs index d903ad17ee2..5bb8e743243 100644 --- a/ui/app/templates/workspace/projects/new.hbs +++ b/ui/app/templates/workspace/projects/new.hbs @@ -1,3 +1,5 @@ +{{page-title (t 'form.project_new.title')}} +
diff --git a/ui/app/templates/workspace/projects/project/app.hbs b/ui/app/templates/workspace/projects/project/app.hbs index 9012ffeec69..0fa8ffd6eb6 100644 --- a/ui/app/templates/workspace/projects/project/app.hbs +++ b/ui/app/templates/workspace/projects/project/app.hbs @@ -1,3 +1,5 @@ +{{page-title @model.application.application}} + {{#if (and (not-eq this.target.currentRouteName 'workspace.projects.project.app.build') (not-eq this.target.currentRouteName 'workspace.projects.project.app.deployment') diff --git a/ui/app/templates/workspace/projects/project/app/build.hbs b/ui/app/templates/workspace/projects/project/app/build.hbs index fb9652d25c6..9a2cf97b37f 100644 --- a/ui/app/templates/workspace/projects/project/app/build.hbs +++ b/ui/app/templates/workspace/projects/project/app/build.hbs @@ -1,3 +1,5 @@ +{{page-title (concat "Build" " v" @model.sequence)}} + {{#let (or @model.pushedArtifact @model) as |operation|}}
diff --git a/ui/app/templates/workspace/projects/project/app/builds.hbs b/ui/app/templates/workspace/projects/project/app/builds.hbs index 8ebfade8903..1b619eb63cd 100644 --- a/ui/app/templates/workspace/projects/project/app/builds.hbs +++ b/ui/app/templates/workspace/projects/project/app/builds.hbs @@ -1,3 +1,5 @@ +{{page-title (concat @model.application.application "Builds")}} +

{{t "page.builds.title"}}

    diff --git a/ui/app/templates/workspace/projects/project/app/deployment.hbs b/ui/app/templates/workspace/projects/project/app/deployment.hbs index b370a83a045..ae08f843bbc 100644 --- a/ui/app/templates/workspace/projects/project/app/deployment.hbs +++ b/ui/app/templates/workspace/projects/project/app/deployment.hbs @@ -1,3 +1,5 @@ +{{page-title (concat "Deployment" " v" @model.sequence)}} +

    v{{@model.sequence}}

    diff --git a/ui/app/templates/workspace/projects/project/app/deployments.hbs b/ui/app/templates/workspace/projects/project/app/deployments.hbs index 82e6317a585..45379885c2f 100644 --- a/ui/app/templates/workspace/projects/project/app/deployments.hbs +++ b/ui/app/templates/workspace/projects/project/app/deployments.hbs @@ -1,3 +1,5 @@ +{{page-title (concat @model.application.application "Deployments")}} +

    {{t "page.deployments.title"}}

    diff --git a/ui/app/templates/workspace/projects/project/app/exec.hbs b/ui/app/templates/workspace/projects/project/app/exec.hbs index 92fb4df142d..180f34ef534 100644 --- a/ui/app/templates/workspace/projects/project/app/exec.hbs +++ b/ui/app/templates/workspace/projects/project/app/exec.hbs @@ -1,3 +1,5 @@ +{{page-title (concat @model.application.application "Exec")}} +

    Exec

    diff --git a/ui/app/templates/workspace/projects/project/app/logs.hbs b/ui/app/templates/workspace/projects/project/app/logs.hbs index ebd66e34201..21723ff246d 100644 --- a/ui/app/templates/workspace/projects/project/app/logs.hbs +++ b/ui/app/templates/workspace/projects/project/app/logs.hbs @@ -1,3 +1,5 @@ +{{page-title (concat @model.application.application "Logs")}} +

    Application logs

    \ No newline at end of file diff --git a/ui/app/templates/workspace/projects/project/app/release.hbs b/ui/app/templates/workspace/projects/project/app/release.hbs index 3be0acb225e..28c28569d64 100644 --- a/ui/app/templates/workspace/projects/project/app/release.hbs +++ b/ui/app/templates/workspace/projects/project/app/release.hbs @@ -1,3 +1,5 @@ +{{page-title (concat "Release" " v" @model.sequence)}} +
    {{! TODO(jgwhite): Make this a real

    }} diff --git a/ui/app/templates/workspace/projects/project/app/releases.hbs b/ui/app/templates/workspace/projects/project/app/releases.hbs index e3e053d6d05..5dc5e0acd9b 100644 --- a/ui/app/templates/workspace/projects/project/app/releases.hbs +++ b/ui/app/templates/workspace/projects/project/app/releases.hbs @@ -1,3 +1,5 @@ +{{page-title (concat @model.application.application "Releases")}} +

    {{t "page.releases.title"}}

      diff --git a/ui/app/templates/workspace/projects/project/apps.hbs b/ui/app/templates/workspace/projects/project/apps.hbs index 49f9a7d42ad..2cfc75665a7 100644 --- a/ui/app/templates/workspace/projects/project/apps.hbs +++ b/ui/app/templates/workspace/projects/project/apps.hbs @@ -1,3 +1,5 @@ +{{page-title @model.name}} +

      {{@model.name}}

      diff --git a/ui/package.json b/ui/package.json index 4fe64a15741..8be03272dfd 100644 --- a/ui/package.json +++ b/ui/package.json @@ -78,7 +78,7 @@ "ember-load-initializers": "^2.1.2", "ember-maybe-import-regenerator": "^0.1.6", "ember-named-blocks-polyfill": "^0.2.4", - "ember-page-title": "^6.0.3", + "ember-page-title": "^6.2.2", "ember-qunit": "^5.1.1", "ember-resolver": "^8.0.2", "ember-set-helper": "^2.0.0", diff --git a/ui/yarn.lock b/ui/yarn.lock index 8b8e8ffff0c..1217cacc2b1 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -8748,12 +8748,12 @@ ember-native-dom-helpers@^0.7.0: broccoli-funnel "^1.1.0" ember-cli-babel "^6.6.0" -ember-page-title@^6.0.3: - version "6.2.0" - resolved "https://registry.yarnpkg.com/ember-page-title/-/ember-page-title-6.2.0.tgz#d79f7422299ebb8f8ac819399596e8f54f01a0e9" - integrity sha512-mgzI59rVH6Q00uG1OnsbrSfic+MxFQbtsjX3BuDWGgU7hWahDhAAgaQrKIFx99aEqWoiL+OiX4tQLPnxyZEceA== +ember-page-title@^6.2.2: + version "6.2.2" + resolved "https://registry.yarnpkg.com/ember-page-title/-/ember-page-title-6.2.2.tgz#980838c44e96cba1d00f42435d707936af627324" + integrity sha512-YTXA+cylZrh9zO0zwjlaAGReT2MVOxAMnVO1OOygFrs1JBs4D6CKV3tImoilg3AvIXFBeJfFNNUbJOdRd9IGGg== dependencies: - ember-cli-babel "^7.22.1" + ember-cli-babel "^7.23.1" ember-qunit@^5.1.1: version "5.1.2"