diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/overview/RangeSelector.vue b/app/javascript/dashboard/components-next/captain/pageComponents/overview/RangeSelector.vue index d003480dd..18a11effc 100644 --- a/app/javascript/dashboard/components-next/captain/pageComponents/overview/RangeSelector.vue +++ b/app/javascript/dashboard/components-next/captain/pageComponents/overview/RangeSelector.vue @@ -6,7 +6,7 @@ import { vOnClickOutside } from '@vueuse/components'; import Button from 'dashboard/components-next/button/Button.vue'; import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue'; -const modelValue = defineModel({ type: String, default: '30' }); +const modelValue = defineModel({ type: String, default: '7' }); const { t } = useI18n(); const [showDropdown, toggleDropdown] = useToggle(); diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/overview/WelcomeCard.vue b/app/javascript/dashboard/components-next/captain/pageComponents/overview/WelcomeCard.vue index 5e868956f..ec5290634 100644 --- a/app/javascript/dashboard/components-next/captain/pageComponents/overview/WelcomeCard.vue +++ b/app/javascript/dashboard/components-next/captain/pageComponents/overview/WelcomeCard.vue @@ -7,7 +7,7 @@ import MessageFormatter from 'shared/helpers/MessageFormatter.js'; const props = defineProps({ range: { type: String, - default: '30', + default: '7', }, stats: { type: Object, diff --git a/app/javascript/dashboard/routes/dashboard/captain/assistants/overview/Index.vue b/app/javascript/dashboard/routes/dashboard/captain/assistants/overview/Index.vue index 124b7c924..1cab1908a 100644 --- a/app/javascript/dashboard/routes/dashboard/captain/assistants/overview/Index.vue +++ b/app/javascript/dashboard/routes/dashboard/captain/assistants/overview/Index.vue @@ -23,7 +23,7 @@ const route = useRoute(); const { checkPermissions } = usePolicy(); const canDrilldown = computed(() => checkPermissions(['administrator'])); -const selectedRange = ref('this_month'); +const selectedRange = ref('7'); const assistantId = computed(() => route.params.assistantId); const metricStats = ref(null); diff --git a/enterprise/app/builders/captain/assistant_stats_window.rb b/enterprise/app/builders/captain/assistant_stats_window.rb index 4495ef1e8..003e5a9d6 100644 --- a/enterprise/app/builders/captain/assistant_stats_window.rb +++ b/enterprise/app/builders/captain/assistant_stats_window.rb @@ -11,7 +11,7 @@ class Captain::AssistantStatsWindow include TimezoneHelper - DEFAULT_RANGE = '30'.freeze + DEFAULT_RANGE = '7'.freeze ALLOWED_RANGES = %w[7 30 90 this_month last_month].freeze attr_reader :range diff --git a/spec/enterprise/builders/captain/assistant_stats_builder_spec.rb b/spec/enterprise/builders/captain/assistant_stats_builder_spec.rb index f08748ef5..af548494c 100644 --- a/spec/enterprise/builders/captain/assistant_stats_builder_spec.rb +++ b/spec/enterprise/builders/captain/assistant_stats_builder_spec.rb @@ -117,9 +117,9 @@ RSpec.describe Captain::AssistantStatsBuilder do end it 'falls back to the default range for values outside the allowed set' do - expect(described_class.new(assistant, '365000').range).to eq('30') - expect(described_class.new(assistant, 'bogus').range).to eq('30') - expect(described_class.new(assistant, nil).range).to eq('30') + expect(described_class.new(assistant, '365000').range).to eq('7') + expect(described_class.new(assistant, 'bogus').range).to eq('7') + expect(described_class.new(assistant, nil).range).to eq('7') end end