diff --git a/.rubocop.yml b/.rubocop.yml index a97d28d32..620dd4c8f 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -23,7 +23,7 @@ Metrics/MethodLength: - 'enterprise/lib/captain/agent.rb' RSpec/ExampleLength: - Max: 25 + Max: 50 Style/Documentation: Enabled: false diff --git a/app/javascript/dashboard/assets/images/curved-arrow-red.svg b/app/javascript/dashboard/assets/images/curved-arrow-red.svg deleted file mode 100644 index 10a8dbcb9..000000000 --- a/app/javascript/dashboard/assets/images/curved-arrow-red.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/app/javascript/dashboard/assets/images/curved-arrow.svg b/app/javascript/dashboard/assets/images/curved-arrow.svg new file mode 100644 index 000000000..f021b57ba --- /dev/null +++ b/app/javascript/dashboard/assets/images/curved-arrow.svg @@ -0,0 +1,9 @@ + + + + diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue index 4e2cc90bf..673ff66f8 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue @@ -124,9 +124,9 @@ const handleManualLinkClick = () => { class="mt-6 relative overflow-visible" > 0 } } + totals = responses.map { |r| r.sum { |e| e['value'] } } + timestamps = responses.map { |r| r.map { |e| e['timestamp'] } } + + # Data conservation and redistribution + expect(totals.uniq).to eq([6]) + expect(data_entries[0].map { |e| e['value'] }).to eq([1, 5]) + expect(data_entries[1].map { |e| e['value'] }).to eq([3, 3]) + expect(data_entries[2].map { |e| e['value'] }).to eq([4, 2]) + + # Timestamp differences + expect(timestamps.uniq.size).to eq(3) + timestamps[0].zip(timestamps[1]).each { |utc, pst| expect(utc - pst).to eq(-28_800) } end - - data_entries = responses.map { |r| r.select { |e| e['value'] > 0 } } - totals = responses.map { |r| r.sum { |e| e['value'] } } - timestamps = responses.map { |r| r.map { |e| e['timestamp'] } } - - # Data conservation and redistribution - expect(totals.uniq).to eq([6]) - expect(data_entries[0].map { |e| e['value'] }).to eq([1, 5]) - expect(data_entries[1].map { |e| e['value'] }).to eq([3, 3]) - expect(data_entries[2].map { |e| e['value'] }).to eq([4, 2]) - - # Timestamp differences - expect(timestamps.uniq.size).to eq(3) - timestamps[0].zip(timestamps[1]).each { |utc, pst| expect(utc - pst).to eq(-28_800) } end end