Merge branch 'gl-card-license-history' into 'master'

Move license history to gl-table utility class See merge request gitlab-org/gitlab!58531

Merge branch 'gl-card-license-history' into 'master'
Move license history to gl-table utility class See merge request gitlab-org/gitlab!58531
d1c676e2 · James Lopez · 2d4659e8 · 4787fa0f · d1c676e2 · d1c676e2
Commit d1c676e2 authored Apr 27, 2021 by James Lopez
2 changed files
--- a/changelogs/unreleased/gl-card-license-history.yml
+++ b/changelogs/unreleased/gl-card-license-history.yml
+---
+title: Move license history to gl-table utility class
+merge_request: 58531
+author: Yogi (@yo)
+type: changed
--- a/ee/app/views/admin/licenses/_license_history.html.haml
+++ b/ee/app/views/admin/licenses/_license_history.html.haml
@@ -2,37 +2,36 @@
 %h4= _('License History')
-.card#license_history
+%table.gl-table.table#license_history
-  %table.table
+  %thead
-    %thead.card-header
+    %tr
-      %tr
+      - licensee_keys.each do |label|
+        %th= label
+      %th= _('Plan')
+      %th= _('Uploaded on')
+      %th= _('Valid from')
+      %th= _('Expires on')
+      %th= _('Users in License')
+  %tbody
+    - @licenses.each do |license|
+      %tr{ class: ('gl-bg-blue-50 font-weight-bold gl-text-blue-500' if license == @license), data: { testid: ('license-current' if license == @license) } }
        - licensee_keys.each do |label|
-          %th= label
+          %td= license.licensee[label]
-        %th= _('Plan')
+        %td
-        %th= _('Uploaded on')
+          %span
-        %th= _('Valid from')
+            = license.plan.capitalize
-        %th= _('Expires on')
+        %td
-        %th= _('Users in License')
+          %span
-    %tbody
+            = l(license.created_at, format: :with_timezone)
-      - @licenses.each do |license|
+        %td
-        %tr{ class: ('gl-bg-blue-50 font-weight-bold gl-text-blue-500' if license == @license), data: { testid: ('license-current' if license == @license) } }
+          %span
-          - licensee_keys.each do |label|
+            = l(license.starts_at)
-            %td= license.licensee[label]
+        %td
-          %td
+          %span
-            %span
+            = license.expires_at.present? ? l(license.expires_at) : _('Never')
-              = license.plan.capitalize
+        %td
-          %td
+          %span
-            %span
+            - if license.restricted?(:active_user_count)
-              = l(license.created_at, format: :with_timezone)
+              = license.restrictions[:active_user_count]
-          %td
+            - else
-            %span
+              = _('Unlimited')
-              = l(license.starts_at)
-          %td
-            %span
-              = license.expires_at.present? ? l(license.expires_at) : _('Never')
-          %td
-            %span
-              - if license.restricted?(:active_user_count)
-                = license.restrictions[:active_user_count]
-              - else
-                = _('Unlimited')