kaui 4.0.24 → 4.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19115a4ca850dfd755598a560dc66e96b00694f00b305e057260fd6b13c57e3d
-  data.tar.gz: 9780699cd5e97d8c6887b3e0c200d968a11e644afd5496c58829277d558a28bc
+  metadata.gz: 939bd1335abb8e3253fba3edb39871baab6a2bca5f7e10f26747b8bf22c3bfa9
+  data.tar.gz: eb850fd782524ffae4f8a7a652eece483244ddeb798d5221485b083e8f1d0039
 SHA512:
-  metadata.gz: 8bcf2e6e322833277c4d305aca8621bf4495cc6443961af0a565bf7da0d6efdb5892d8b66ac31e820f08953d221ad54b309018fbd3d088032e211ea73d51abd9
-  data.tar.gz: e1a44d558e7b996185be6a79cca68fb2eecb4e200f2affff7e5de3ccf0ca6a38f78d0ffdc814c67f3ab794585e6d7b4c4604dfe06ea77e7b7bc86360e229273e
+  metadata.gz: e07257d417598b8ef1514b22bf2551673b07c64aa66164f0e791751f2e93e362853a2d60c5d376bf3254b78498b208fb76c39abb7e342866288896b91acdeebe
+  data.tar.gz: a61104d90eddee06456c260d26c1adca1a6ad0fb0790587063592178ba40722be8b7efcbdaaf6de6575712f660d396b48613004dafadd43a12b7477c43495b79

data/README.md

@@ -19,7 +19,7 @@ Kill Bill compatibility
 Dependencies
 ------------
 
-Ruby 3.2.2+ or JRuby 9.4.2.0+ required.
+Ruby 3.1.0+ or JRuby 10.0.6.0+ required.
 
 Running Kaui locally
 ---------------------

data/app/assets/images/kaui/blocking-states/shield-white.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M10 1.66675L17.0833 4.16675V9.44119C17.0833 13.2489 14.5321 16.5934 10.8563 17.5793L10 17.8085L9.14367 17.5793C5.46791 16.5934 2.91667 13.2489 2.91667 9.44119V4.16675L10 1.66675Z" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

data/app/assets/images/kaui/timeline/block.svg

@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10 18.3337C14.6024 18.3337 18.3334 14.6027 18.3334 10.0003C18.3334 5.39795 14.6024 1.66699 10 1.66699C5.39765 1.66699 1.66669 5.39795 1.66669 10.0003C1.66669 14.6027 5.39765 18.3337 10 18.3337Z" stroke="#414651" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.39587 4.39795L15.6042 15.6062" stroke="#414651" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

data/app/assets/stylesheets/kaui/auth_pages.css

@@ -2,6 +2,15 @@
   min-height: 100vh;
   width: 100%;
   background-color: #fff;
+  overflow: hidden;
+}
+
+.auth-container .centered-absolute {
+  position: relative;
+  top: 0;
+  left: 0;
+  transform: none;
+  margin: 1.5rem auto 0;
 }
 
 .auth-form-container {

data/app/assets/stylesheets/kaui/kaui.css

@@ -16,209 +16,3 @@
     image-url("glyphicons-halflings-regular.ttf") format("truetype"),
     image-url("glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg");
 }
-
-.tag-bar {
-  border-bottom: 0.0625rem solid #ddd;
-  margin-bottom: 0;
-  position: relative;
-}
-
-.tag-bar .tag-select {
-  display: inline-block;
-  vertical-align: middle;
-}
-
-@media (max-width: 28.125rem) {
-  .tag-bar .tag-select {
-    width: 35%;
-  }
-}
-
-.tag-bar .tag-select span {
-  padding: 0.3125rem 1.25rem;
-  text-align: center;
-  display: block;
-  border-right: 0.0625rem solid #ddd;
-}
-
-@media (max-width: 48rem) {
-  .tag-bar .tag-select span {
-    border: 0;
-  }
-}
-
-.tag-bar .tag-select span i {
-  margin: 0 0.3125rem;
-  color: #515151;
-  font-size: 1rem;
-}
-
-.tag-bar .tag-select span i.fa-caret-down {
-  color: #999999;
-  font-size: 0.75rem;
-}
-
-.tag-bar .tag-select span i.fa-tag {
-  font-size: 1.125rem;
-}
-
-.tag-bar .tag-select span i.fa-money,
-.tag-bar .tag-select span i.fa-credit-card {
-  font-size: 1rem;
-}
-
-.tag-bar .tag-select:hover .tag-select-box {
-  max-height: 31.25rem;
-  padding: 1.25rem 1.5625rem;
-  border: 0.0625rem solid #ddd;
-  box-shadow: 0.0625rem 0.1875rem 0.125rem rgba(0, 0, 0, 0.11);
-}
-
-.tag-bar .tag-select .tag-select-box {
-  position: absolute;
-  top: 100%;
-  left: -0.0625rem;
-  max-height: 0;
-  background-color: #fff;
-  z-index: 100;
-  padding: 0 0.9375rem;
-  font-size: 0.75rem;
-  color: #999999;
-  overflow: auto;
-  width: auto;
-  border-bottom: 0;
-  display: inline-block;
-}
-
-@media (max-width: 48rem) {
-  .tag-bar .tag-select .tag-select-box {
-    border: 0;
-  }
-}
-
-.tag-bar .tag-select .tag-select-box strong {
-  display: block;
-  font-weight: 400;
-  margin: 0 0 0.625rem;
-}
-
-.tag-bar .tag-select .tag-select-box form {
-  display: inline-block;
-  width: 13.125rem;
-}
-
-.tag-bar .tag-select .tag-select-box input[type="checkbox"] {
-  display: inline-block;
-  width: 9%;
-  margin: 0 1% 0 0;
-  line-height: 1.25rem;
-  vertical-align: middle;
-}
-
-.tag-bar .tag-select .tag-select-box label {
-  font-size: 0.75rem;
-  display: inline-block;
-  width: 85%;
-  line-height: 1.25rem;
-  vertical-align: middle;
-  margin: 0;
-  font-weight: 400;
-}
-
-.tag-bar .tag-select .tag-select-box textarea {
-  resize: none;
-  height: 5rem;
-  margin: 0 0 1.25rem;
-  width: 100%;
-}
-
-.tag-bar .tag-select .tag-select-box a {
-  display: block;
-  font-size: 0.75rem;
-  line-height: 1.25rem;
-}
-
-.tag-bar .tag-selected {
-  display: inline-block;
-  padding: 0.125rem 0.3125rem;
-  vertical-align: middle;
-}
-
-@media (max-width: 48rem) {
-  .tag-bar .tag-selected {
-    width: 64%;
-    padding: 0.125rem;
-    overflow: hidden;
-    border-left: 0.0625rem solid #ddd;
-  }
-}
-
-.tag-bar .tag-selected span {
-  display: inline-block;
-  font-size: 0.75rem;
-  color: #777777;
-  background: #e5e5e5;
-  padding: 0.1875rem 1.25rem;
-  margin: 0 0.3125rem;
-  transition: all 0.5s;
-  cursor: pointer;
-}
-
-.tag-bar .tag-selected span:hover {
-  background-color: #cce9eb;
-}
-
-@media (max-width: 48rem) {
-  .tag-bar .tag-selected span {
-    font-size: 0.625rem;
-    padding: 0.1875rem 0.3125rem;
-    display: block;
-    margin: 0 0 0.125rem;
-  }
-}
-
-.tag-bar-breathe {
-  margin-bottom: 1.875rem;
-}
-
-.tag-bar-no-border {
-  border-bottom: 0;
-}
-
-.tag-bar-no-border .tag-select span {
-  border-right: 0;
-}
-
-#main-menu .tag-bar .tag-select {
-  position: relative;
-}
-
-#main-menu .tag-bar .tag-select-box {
-  word-break: keep-all;
-  white-space: nowrap;
-}
-
-.inline-row-tag-bar {
-  padding-left: 0.625rem !important;
-}
-
-.inline-row-tag-bar .tag-bar .tag-select span {
-  padding: 0.3125rem;
-  border-right: none;
-}
-
-.inline-row-tag-bar .tag-bar .tag-select span i {
-  margin: 0 0.1875rem;
-  font-size: 0.75rem;
-}
-
-.inline-row-tag-bar .tag-bar .tag-select span i.fa-tag {
-  font-size: 0.75rem;
-}
-
-.inline-row-tag-bar .tag-bar .tag-select-box label {
-  white-space: nowrap;
-}
-
-
-/*# sourceMappingURL=kaui2.css.map */

data/app/assets/stylesheets/kaui/subscription.css

@@ -437,6 +437,44 @@ table tr.expired td {
   right: 0.5rem;
 }
 
+/* app/views/kaui/components/blocking_state_form/_about_panel.html.erb */
+
+.blocking-state-about-panel {
+  flex: 0 0 20rem;
+  max-width: 20rem;
+  height: fit-content;
+  padding: 1.25rem;
+  background-color: #EFF6FF;
+  border: 0.0625rem solid #DBEAFE;
+  border-radius: 0.5rem;
+}
+
+.blocking-state-about-panel .icon-container {
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  width: 2.5rem;
+  height: 2.5rem;
+  border-radius: 50%;
+  background-color: #2563EB;
+  flex-shrink: 0;
+}
+
+.blocking-state-about-panel h6 {
+  font-weight: 600;
+  font-size: 1rem;
+  line-height: 1.5rem;
+  color: #1B1C1E;
+}
+
+.blocking-state-about-panel p {
+  font-size: 0.875rem;
+  font-weight: 400;
+  line-height: 1.25rem;
+  color: #414651;
+  margin-bottom: 0;
+}
+
 .kaui-subscription-new .form-group.d-flex.pb-3 .form-control {
   height: 2.5rem;
   border-radius: 0.375rem;

data/app/assets/stylesheets/kaui/tags.css

@@ -15,7 +15,7 @@
   }
 }
 
-.tag-bar .tag-select span {
+.tag-bar .tag-select > span {
   padding: 0.3125rem 1.25rem;
   text-align: center;
   display: block;
@@ -23,7 +23,7 @@
 }
 
 @media (max-width: 48rem) {
-  .tag-bar .tag-select span {
+  .tag-bar .tag-select > span {
     border: 0;
   }
 }
@@ -67,9 +67,8 @@
   font-size: 0.75rem;
   color: #999999;
   overflow: hidden;
-  min-width: 15rem;
-  width: max-content;
-  max-width: min(25rem, 95vw);
+  width: 17rem;
+  max-width: min(17rem, 95vw);
   border-bottom: 0;
   display: inline-block;
 }
@@ -107,6 +106,7 @@
   vertical-align: middle;
   margin: 0;
   font-weight: 400;
+  overflow-wrap: anywhere;
 }
 
 .tag-bar .tag-select .tag-select-box textarea {
@@ -169,7 +169,7 @@
   border-bottom: 0;
 }
 
-.tag-bar-no-border .tag-select span {
+.tag-bar-no-border .tag-select > span {
   border-right: 0;
 }
 
@@ -186,7 +186,7 @@
   padding-left: 0.625rem !important;
 }
 
-.inline-row-tag-bar .tag-bar .tag-select span {
+.inline-row-tag-bar .tag-bar .tag-select > span {
   padding: 0.3125rem;
   border-right: none;
 }

data/app/controllers/kaui/account_timelines_controller.rb

@@ -11,6 +11,7 @@ module Kaui
       @invoices = timeline.invoices
       @payments = timeline.payments
       extract_invoices_by_id(@invoices)
+      @account_blocking_states = fetch_account_blocking_states(@account)
 
       # Lookup all bundle names
       @bundle_names = {}
@@ -51,6 +52,7 @@ module Kaui
       @invoices = timeline.invoices
       @payments = timeline.payments
       extract_invoices_by_id(@invoices)
+      @account_blocking_states = fetch_account_blocking_states(@account)
 
       # Lookup all bundle names
       @bundle_names = {}
@@ -117,20 +119,30 @@ module Kaui
           @bundles.each do |bundle|
             bundle.subscriptions.each do |sub|
               sub.events.each do |event|
-                # Skip SERVICE_STATE_CHANGE events
-                next if event.event_type == 'SERVICE_STATE_CHANGE'
-
                 effective_date = event.effective_date.present? ? Date.parse(event.effective_date).to_s : '[unknown]'
                 bundle_keys = @bundle_names[bundle.external_key]
-                event_type = event.event_type
-                phase = event.phase
                 audit_logs = event.audit_logs.present? ? event.audit_logs.map { |entry| Kaui::AuditLog.description(entry) }.join(', ') : ''
+                details = if event.event_type == 'SERVICE_STATE_CHANGE' || event.is_blocked_billing || event.is_blocked_entitlement
+                            "#{event.service_name}/#{event.service_state_name} (billing=#{event.is_blocked_billing}, entitlement=#{event.is_blocked_entitlement})"
+                          else
+                            event.phase
+                          end
 
-                csv << [effective_date, bundle_keys, event_type, phase, audit_logs] if filter_date?(effective_date, start_date, end_date)
+                csv << [effective_date, bundle_keys, event.event_type, details, audit_logs] if filter_date?(effective_date, start_date, end_date)
               end
             end
           end
         end
+
+        if %w[ENTITLEMENT ALL].include?(event_type)
+          @account_blocking_states.each do |blocking_state|
+            effective_date = blocking_state.effective_date.present? ? Date.parse(blocking_state.effective_date).to_s : '[unknown]'
+            audit_logs = blocking_state.audit_logs.present? ? blocking_state.audit_logs.map { |entry| Kaui::AuditLog.description(entry) }.join(', ') : ''
+            details = "#{blocking_state.service}/#{blocking_state.state_name} (billing=#{blocking_state.is_block_billing}, entitlement=#{blocking_state.is_block_entitlement}, change=#{blocking_state.is_block_change})"
+
+            csv << [effective_date, '', 'SERVICE_STATE_CHANGE', details, audit_logs] if filter_date?(effective_date, start_date, end_date)
+          end
+        end
       end
 
       send_data csv_string, filename: "account-timelines-#{Time.zone.today}.csv", type: 'text/csv'
@@ -161,5 +173,11 @@ module Kaui
         [invoice.invoice_id, Kaui::Invoice.build_from_raw_invoice(invoice)]
       end
     end
+
+    def fetch_account_blocking_states(account)
+      account.blocking_states(nil, nil, 'NONE', options_for_klient)
+    rescue StandardError
+      []
+    end
   end
 end

data/app/controllers/kaui/accounts_controller.rb

@@ -156,7 +156,15 @@ module Kaui
       @children = wait(fetch_children)
       @account_parent = @account.parent_account_id.nil? ? nil : wait(fetch_parent)
       @email_notification_configuration = is_email_notifications_plugin_available ? wait(fetch_email_notification_configuration) : []
-      @bundles = wait(fetch_bundles)
+      @bundles = begin
+        wait(fetch_bundles)
+      rescue KillBillClient::API::ResponseError => e
+        # e.g. a subscription references a plan that no longer exists in the currently loaded catalog.
+        # Don't fail the whole account page for this, just warn and show it without bundle-derived data.
+        Rails.logger.warn("Unable to fetch bundles for account #{@account.account_id}: #{as_string(e)}")
+        flash.now[:warning] = "Unable to load some subscription details: #{as_string(e)}"
+        []
+      end
 
       @last_transaction_by_payment_method_id = {}
       wait(fetch_payments).each do |payment|
@@ -383,5 +391,20 @@ module Kaui
       data = KillBillClient::Model::Export.find_by_account_id(params[:account_id], current_user.kb_username, options_for_klient)
       send_data data, filename: "account#{params[:account_id]}.txt", type: :txt
     end
+
+    def block
+      @account = Kaui::Account.find_by_id(params.require(:account_id), false, false, options_for_klient)
+    end
+
+    def do_block
+      account_id = params.require(:account_id)
+      account = Kaui::Account.new(account_id:)
+      account.set_blocking_state(params.require(:state_name), params.require(:service),
+                                 params[:is_block_change] == '1', params[:is_block_entitlement] == '1',
+                                 params[:is_block_billing] == '1', params[:requested_date].presence,
+                                 current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+
+      redirect_to account_path(account_id), notice: 'Blocking state was successfully created'
+    end
   end
 end

data/app/controllers/kaui/bundles_controller.rb

@@ -128,6 +128,20 @@ module Kaui
       redirect_to kaui_engine.account_bundles_path(@account.account_id), notice: msg
     end
 
+    def block
+      @bundle = Kaui::Bundle.find_by_id_or_key(params.require(:id), options_for_klient)
+    end
+
+    def do_block
+      bundle = Kaui::Bundle.new(bundle_id: params.require(:id))
+      bundle.set_blocking_state(params.require(:state_name), params.require(:service),
+                                params[:is_block_change] == '1', params[:is_block_entitlement] == '1',
+                                params[:is_block_billing] == '1', params[:requested_date].presence,
+                                current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+
+      redirect_to kaui_engine.account_bundles_path(params.require(:account_id)), notice: 'Blocking state was successfully created'
+    end
+
     private
 
     def search_bundles(query, search_by, options)

data/app/controllers/kaui/subscriptions_controller.rb

@@ -150,6 +150,20 @@ module Kaui
       redirect_to kaui_engine.account_bundles_path(input_subscription['account_id']), notice: 'Subscription BCD was successfully changed'
     end
 
+    def block
+      @subscription = Kaui::Subscription.find_by_id(params.require(:id), 'NONE', options_for_klient)
+    end
+
+    def do_block
+      subscription = Kaui::Subscription.new(subscription_id: params.require(:id))
+      subscription.set_blocking_state(params.require(:state_name), params.require(:service),
+                                      params[:is_block_change] == '1', params[:is_block_entitlement] == '1',
+                                      params[:is_block_billing] == '1', params[:requested_date].presence,
+                                      current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+
+      redirect_to kaui_engine.account_bundles_path(params.require(:account_id)), notice: 'Blocking state was successfully created'
+    end
+
     def edit_quantity
       @subscription = Kaui::Subscription.find_by_id(params.require(:id), 'NONE', options_for_klient)
     end

data/app/helpers/kaui/date_helper.rb

@@ -24,6 +24,18 @@ module Kaui
       DateTime.parse(date_s).strftime('%FT%T')
     end
 
+    # Best-effort epoch (seconds) timestamp for a timeline entry's date/time
+    # value, used purely for client-side "Sort by Date" ordering on the
+    # account timeline page. Returns nil if the date is missing or cannot be
+    # parsed (entries without a usable timestamp are sorted last).
+    def timeline_sort_timestamp(date)
+      return nil if date.blank?
+
+      DateTime.parse(date.to_s).to_i
+    rescue ArgumentError, TypeError
+      nil
+    end
+
     # Retrieve current killbill server time based on a time zone.
     # if no time zone is provided it will return UTC.
     # if the killbill server is not reachable it will return the time of the Kaui server

data/app/helpers/kaui/exception_helper.rb

@@ -21,7 +21,7 @@ module Kaui
         I18n.t('errors.messages.error_communicating_killbill')
       else
         # Show detailed error in development/test, or when KAUI_SHOW_ERROR_DETAILS is set (for Docker)
-        show_details = Rails.env.development? || Rails.env.test? || ENV['KAUI_SHOW_ERROR_DETAILS'].present?
+        show_details = Rails.env.local? || ENV['KAUI_SHOW_ERROR_DETAILS'].present?
         show_details ? exception.message : nil
       end
     end

data/app/services/dependencies/aviate.rb

@@ -21,10 +21,13 @@ module Dependencies
         # Any error (plugin not installed, missing/invalid JWT, network issue, etc.) is treated as
         # "not Aviate" so that callers can safely fall back to the existing XML-catalog behavior.
         def aviate_catalog?(account_id, options_for_klient)
-          response = KillBillClient::API.get("#{KILLBILL_AVIATE_PREFIX}/catalog/info", catalog_params(account_id), request_options(options_for_klient))
-          JSON.parse(response.body)['state'] == CATALOG_STATE_AVIATE
-        rescue StandardError => e
-          Rails.logger.warn("Failed to retrieve Aviate catalog info: #{e.class}: #{e.message}")
+          params_list = account_id.present? ? [{ accountId: account_id }, {}] : [{}]
+          params_list.each do |params|
+            response = KillBillClient::API.get("#{KILLBILL_AVIATE_PREFIX}/catalog/info", params, request_options(options_for_klient))
+            return true if JSON.parse(response.body)['state'] == CATALOG_STATE_AVIATE
+          rescue StandardError => e
+            Rails.logger.warn("Failed to retrieve Aviate catalog info (params=#{params}): #{e.class}: #{e.message}")
+          end
           false
         end