Merge branch 'main' into docs/envoy-extensions

hashicorp · Feb 22, 2023 · 1cc8a32 · 1cc8a32
2 parents 495bfd6 + 0c66bbf
commit 1cc8a32
Show file tree

Hide file tree

Showing 91 changed files with 1,491 additions and 843 deletions.
diff --git a/.changelog/16251.txt b/.changelog/16251.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+ui: update from <button> and <a> to design-system-components button <Hds::Button>
+```
diff --git a/.github/workflows/nightly-test-1.15.x.yaml b/.github/workflows/nightly-test-1.15.x.yaml
@@ -7,7 +7,7 @@ on:
 env:
   EMBER_PARTITION_TOTAL: 4      # Has to be changed in tandem with the matrix.partition
   BRANCH: "release/1.15.x"
-  BRANCH_NAME: "release/1.15.x" # Used for naming artifacts
+  BRANCH_NAME: "release-1.15.x" # Used for naming artifacts
 
 jobs:
   frontend-test-workspace-node:

diff --git a/ui/packages/consul-acls/app/components/consul/token/selector/index.hbs b/ui/packages/consul-acls/app/components/consul/token/selector/index.hbs
@@ -64,11 +64,11 @@
             </AuthForm>
           </BlockSlot>
           <BlockSlot @name="actions">
-            <Action
-              {{on "click" modal.close}}
-            >
-              Continue without logging in
-            </Action>
+            <Hds::Button
+              @color='secondary'
+              @text='Continue without logging in'
+              {{on 'click' modal.close}}
+            />
           </BlockSlot>
         </ModalDialog>
       </:unauthorized>
@@ -106,11 +106,11 @@
             </AuthForm>
           </BlockSlot>
           <BlockSlot @name="actions">
-            <Action
+            <Hds::Button
+              @color='secondary'
+              @text='Continue without logging in'
               {{on 'click' modal.close}}
-            >
-              Continue without logging in
-            </Action>
+            />
           </BlockSlot>
         </ModalDialog>
         <Portal @target="app-before-skip-links">

diff --git a/ui/packages/consul-lock-sessions/app/components/consul/lock-session/form/index.hbs b/ui/packages/consul-lock-sessions/app/components/consul/lock-session/form/index.hbs
@@ -47,11 +47,14 @@
             <dd>{{@item.ID}}</dd>
             <dt>Node</dt>
             <dd>
-                <a
-                  href={{href-to 'dc.nodes.show' @item.Node}}
-                >
-                  {{@item.Node}}
-                </a>
+              <Hds::Button
+                @text={{@item.Node}}
+                @icon='git-commit'
+                @href={{href-to 'dc.nodes.show' @item.Node}}
+                @isHrefExternal={{false}}
+                @size='small'
+                @color='tertiary'
+              />
             </dd>
             <dt>Delay</dt>
             <dd>{{duration-from @item.LockDelay}}</dd>
@@ -74,30 +77,30 @@
   {{#if (can 'delete session' item=@item)}}
         <ConfirmationDialog @message="Are you sure you want to invalidate this Lock Session?">
           <BlockSlot @name="action" as |confirm|>
-            <Action
+            <Hds::Button
+              @text='Invalidate Session'
+              @color='critical'
               data-test-delete
-              class="type-delete"
               {{on 'click' (fn confirm (fn writer.delete @item))}}
-            >
-              Invalidate Session
-            </Action>
+            />
           </BlockSlot>
           <BlockSlot @name="dialog" as |execute cancel message|>
             <p>
               {{message}}
             </p>
-            <Action
-              class="type-delete"
-              {{on 'click' (fn execute)}}
-            >
-              Confirm Invalidation
-            </Action>
-            <Action
-              class="type-cancel"
-              {{on 'click' (fn cancel)}}
-            >
-              Cancel
-            </Action>
+            <Hds::ButtonSet>
+              <Hds::Button
+                @text='Confirm Invalidation'
+                @color='critical'
+                data-test-delete
+                {{on 'click' (fn execute)}}
+              />
+              <Hds::Button
+                @text='Cancel'
+                @color='secondary'
+                {{on 'click' (fn cancel)}}
+              />
+            </Hds::ButtonSet>
           </BlockSlot>
         </ConfirmationDialog>
   {{/if}}

diff --git a/ui/packages/consul-lock-sessions/app/components/consul/lock-session/list/index.hbs b/ui/packages/consul-lock-sessions/app/components/consul/lock-session/list/index.hbs
@@ -81,30 +81,30 @@ as |item index|>
       @message="Are you sure you want to invalidate this session?"
     >
       <BlockSlot @name="action" as |confirm|>
-        <Action
+        <Hds::Button
+          @text='Invalidate'
+          @color='critical'
           data-test-delete
-          class="type-delete"
           {{on 'click' (fn confirm (fn @ondelete item))}}
-        >
-          Invalidate
-        </Action>
+        />
       </BlockSlot>
       <BlockSlot @name="dialog" as |execute cancel message|>
         <p>
           {{message}}
         </p>
-        <Action
-          class="type-delete"
-          {{on 'click' (fn execute)}}
-        >
-          Confirm Invalidate
-        </Action>
-        <Action
-          class="type-cancel"
-          {{on 'click' (fn cancel)}}
-        >
-          Cancel
-        </Action>
+        <Hds::ButtonSet>
+          <Hds::Button
+            @text='Confirm Invalidate'
+            @color='critical'
+            data-test-delete
+            {{on 'click' (fn execute)}}
+          />
+          <Hds::Button
+            @text='Cancel'
+            @color='secondary'
+            {{on 'click' (fn cancel)}}
+          />
+        </Hds::ButtonSet>
       </BlockSlot>
     </ConfirmationDialog>
   </BlockSlot>

diff --git a/ui/packages/consul-lock-sessions/app/templates/dc/nodes/show/sessions.hbs b/ui/packages/consul-lock-sessions/app/templates/dc/nodes/show/sessions.hbs
@@ -85,21 +85,23 @@ as |route|>
               </BlockSlot>
 
                 <BlockSlot @name="actions">
-                  <li class="docs-link">
-                    <Action
+                  <li>
+                    <Hds::Link::Standalone
+                      @text='Documentation on Lock Sessions'
                       @href="{{env 'CONSUL_DOCS_URL'}}/internals/sessions.html"
-                      @external={{true}}
-                    >
-                      Documentation on Lock Sessions
-                    </Action>
+                      @icon='docs-link'
+                      @iconPosition='trailing'
+                      @size='small'
+                    />
                   </li>
-                  <li class="learn-link">
-                    <Action
-                      @href="{{env 'CONSUL_DOCS_LEARN_URL'}}/tutorials/consul/distributed-semaphore"
-                      @external={{true}}
-                    >
-                      Take the tutorial
-                    </Action>
+                  <li>
+                    <Hds::Link::Standalone
+                      @text='Take the tutorial'
+                      @href='{{env 'CONSUL_DOCS_LEARN_URL'}}/tutorials/consul/distributed-semaphore'
+                      @icon='learn-link'
+                      @iconPosition='trailing'
+                      @size='small'
+                    />
                   </li>
                 </BlockSlot>
 

diff --git a/ui/packages/consul-nspaces/app/components/consul/nspace/form/index.hbs b/ui/packages/consul-nspaces/app/components/consul/nspace/form/index.hbs
@@ -102,25 +102,29 @@
               </fieldset>
             {{/if}}
             <div>
+              <Hds::ButtonSet>
               {{#if (and (is "new nspace" item=item) (can "create nspaces"))}}
-                <Action
-                  @type="submit"
-                  {{disabled
-                    (or
+                <Hds::Button
+                  type="submit"
+                  disabled={{or
                       (is "pristine nspace" item=item)
                       (state-matches state "error")
-                    )
                   }}
-                >
-                  Save
-                </Action>
+                  @text='Save'
+                />
               {{else if (can "write nspace" item=item)}}
-                <Action @type="submit">Save</Action>
+                <Hds::Button
+                  type='submit'
+                  @text='Save'
+                />
               {{/if}}
 
-              <Action @type="reset" {{on "click" (fn this.onCancel item)}}>
-                Cancel
-              </Action>
+                <Hds::Button
+                  type='reset'
+                  @color='secondary'
+                  @text='Cancel'
+                  {{on 'click' (fn this.onCancel item)}}
+                />
 
               {{#if
                 (and
@@ -132,13 +136,12 @@
                   @message="Are you sure you want to delete this Namespace?"
                 >
                   <BlockSlot @name="action" as |confirm|>
-                    <Action
+                    <Hds::Button
                       data-test-delete
-                      class="type-delete"
+                      @color='critical'
+                      @text='Delete'
                       {{on "click" (fn confirm (fn writer.delete item))}}
-                    >
-                      Delete
-                    </Action>
+                    />
                   </BlockSlot>
                   <BlockSlot @name="dialog" as |execute cancel message|>
                     <DeleteConfirmation
@@ -149,7 +152,7 @@
                   </BlockSlot>
                 </ConfirmationDialog>
               {{/if}}
-
+              </Hds::ButtonSet>
             </div>
           </StateChart>
         </form>

diff --git a/ui/packages/consul-nspaces/app/templates/dc/nspaces/index.hbs b/ui/packages/consul-nspaces/app/templates/dc/nspaces/index.hbs
@@ -49,7 +49,11 @@ as |route|>
       </BlockSlot>
       <BlockSlot @name="actions">
   {{#if (can "create nspaces")}}
-          <a data-test-create href="{{href-to 'dc.nspaces.create'}}" class="type-create">Create</a>
+    <Hds::Button
+      @text='Create'
+      @route='dc.nspaces.create'
+      data-test-create
+    />
   {{/if}}
       </BlockSlot>
       <BlockSlot @name="toolbar">
@@ -117,11 +121,23 @@ as |route|>
                 </p>
               </BlockSlot>
               <BlockSlot @name="actions">
-                <li class="docs-link">
-                  <a href="{{env 'CONSUL_DOCS_URL'}}/commands/namespace" rel="noopener noreferrer" target="_blank">Documentation on namespaces</a>
+                <li>
+                  <Hds::Link::Standalone
+                    @text='Documentation on namespaces'
+                    @href="{{env 'CONSUL_DOCS_URL'}}/commands/namespace"
+                    @icon='docs-link'
+                    @iconPosition='trailing'
+                    @size='small'
+                  />
                 </li>
-                <li class="learn-link">
-                  <a href="{{env 'CONSUL_DOCS_LEARN_URL'}}/consul/namespaces/secure-namespaces" rel="noopener noreferrer" target="_blank">Read the guide</a>
+                <li>
+                  <Hds::Link::Standalone
+                    @text='Read the guide'
+                    @href="{{env 'CONSUL_DOCS_LEARN_URL'}}/consul/namespaces/secure-namespaces"
+                    @icon='learn-link'
+                    @iconPosition='trailing'
+                    @size='small'
+                  />
                 </li>
               </BlockSlot>
             </EmptyState>

diff --git a/ui/packages/consul-partitions/app/components/consul/partition/form/index.hbs b/ui/packages/consul-partitions/app/components/consul/partition/form/index.hbs
@@ -84,34 +84,37 @@ as |State Guard ChartAction dispatch state|>
   </fieldset>
 
   <div>
+    <Hds::ButtonSet>
+
+
 {{#if (and (is "new partition" item=item) (can "create partitions")) }}
-      <Action
-        @type="submit"
-        {{disabled (or (is "pristine partition" item=item) (state-matches state "error"))}}
-      >
-        Save
-      </Action>
+  <Hds::Button
+    @text='Save'
+    type='submit'
+    disabled={{or (is "pristine partition" item=item) (state-matches state "error")}}
+  />
 {{else if (not readOnly)}}
-      <Action @type="submit">Save</Action>
+  <Hds::Button
+    @text='Save'
+    type='submit'
+  />
 {{/if}}
-
-      <Action
-        @type="reset"
-        {{on 'click' (if @oncancel (fn @oncancel item) (fn @onsubmit item))}}
-      >
-        Cancel
-      </Action>
+      <Hds::Button
+        @text='Cancel'
+        type='reset'
+        @color='secondary'
+        {{on 'click' (if @oncancel (fn (optional @oncancel item)) (fn (optional @onsubmit item)))}}
+      />
 
 {{#if (and (not (is "new partition" item=item)) (can "delete partition" item=item))}}
       <ConfirmationDialog @message="Are you sure you want to delete this Partition?">
         <BlockSlot @name="action" as |confirm|>
-          <Action
+          <Hds::Button
+            @text='Delete'
             data-test-delete
-            class="type-delete"
+            @color='critical'
             {{on 'click' (fn confirm (fn writer.delete item))}}
-          >
-            Delete
-          </Action>
+          />
         </BlockSlot>
         <BlockSlot @name="dialog" as |execute cancel message|>
           <DeleteConfirmation
@@ -122,7 +125,7 @@ as |State Guard ChartAction dispatch state|>
         </BlockSlot>
       </ConfirmationDialog>
 {{/if}}
-
+    </Hds::ButtonSet>
   </div>
 
 </StateChart>

diff --git a/ui/packages/consul-partitions/app/templates/dc/partitions/index.hbs b/ui/packages/consul-partitions/app/templates/dc/partitions/index.hbs
@@ -49,13 +49,11 @@ as |route|>
       </BlockSlot>
       <BlockSlot @name="actions">
 {{#if (can 'create partitions')}}
-        <a 
-          data-test-create 
-          class="type-create"
-          href="{{href-to 'dc.partitions.create'}}"
-        >
-          Create
-        </a>
+  <Hds::Button
+    @text='Create'
+    @route='dc.partitions.create'
+    data-test-create
+  />
 {{/if}}
       </BlockSlot>
       <BlockSlot @name="toolbar">