Repository navigation
feat(console): surface how many devices have a bundle #3032
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 6 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
bcae176
feat(console): surface how many devices have a bundle
riderx d089e15
fix(backend): type device adoption reduce as number
riderx b37efc1
docs: add bundle reach preview for PR 3032
riderx 6ac1019
fix(console): use native progress for bundle reach
riderx d09d918
fix(console): keep bundle reach numbers honest
riderx c501f7a
test: cover bundle reach links and fractional percents
riderx b3de5b3
fix(console): keep bundle reach on Observe only
riderx 3d44828
docs: refresh Observe reach screenshot
riderx fcdd7eb
fix(console): shrink Observe reach to a metric tile
riderx 652d018
fix(console): keep Observe metrics on one row
riderx 59cba7c
fix(console): keep Observe reach name from visible text
riderx ab92495
fix(i18n): drop unused view-bundle-devices context
riderx e598c0d
fix(console): open channel stats from Observe reach
riderx File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| import { expect, test } from '../support/commands' | ||
|
|
||
| test.describe('Bundle reach', () => { | ||
| test.beforeEach(async ({ page }) => { | ||
| await page.login('test@capgo.app', 'testtest') | ||
| }) | ||
|
|
||
| test('shows reach on the bundle page and observe updater', async ({ page }) => { | ||
| await page.goto('/app/com.demo.app/bundle/3') | ||
| const bundleCard = page.locator('[data-test="bundle-adoption-card"]') | ||
| await expect(bundleCard).toBeVisible() | ||
| await expect(bundleCard.getByRole('heading', { name: 'Bundle reach' })).toBeVisible() | ||
|
|
||
| await page.locator('[data-test="bundle-adoption-devices"]').click() | ||
| await expect(page).toHaveURL(/\/app\/com\.demo\.app\/devices\?version=1\.0\.0/) | ||
|
|
||
| await page.goto('/app/com.demo.app/bundle/3') | ||
| await page.locator('[data-test="bundle-adoption-channel"]').click() | ||
| await expect(page).toHaveURL(/\/app\/com\.demo\.app\/channel\/\d+\/statistics/) | ||
|
|
||
| await page.goto('/app/com.demo.app/observe/updater') | ||
| await expect(page.locator('[data-test="bundle-adoption-card"]')).toBeVisible() | ||
|
|
||
| await page.goto('/app/com.demo.app') | ||
| await expect(page.locator('[data-test="release-banner"]')).toBeVisible() | ||
| }) | ||
| }) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,173 @@ | ||
| <script setup lang="ts"> | ||
| import { computed, ref, watch } from 'vue' | ||
| import { useI18n } from 'vue-i18n' | ||
| import { useRouter } from 'vue-router' | ||
| import IconSmartphone from '~icons/lucide/smartphone' | ||
| import IconTrendingUp from '~icons/lucide/trending-up' | ||
| import { getLatestDayVersionAdoption } from '~/services/bundleAdoption' | ||
| import { useChartData } from '~/services/chartDataService' | ||
| import { getChartDateRange } from '~/services/date' | ||
| import { formatNumberValue } from '~/services/formatLocale' | ||
| import { useSupabase } from '~/services/supabase' | ||
|
|
||
| const props = withDefaults(defineProps<{ | ||
| appId: string | ||
| versionName: string | ||
| linkedChannelId?: number | null | ||
| linkedChannelName?: string | null | ||
| compact?: boolean | ||
| }>(), { | ||
| linkedChannelId: null, | ||
| linkedChannelName: null, | ||
| compact: false, | ||
| }) | ||
|
|
||
| const { t } = useI18n() | ||
| const router = useRouter() | ||
| const supabase = useSupabase() | ||
|
|
||
| const loading = ref(true) | ||
| const loadError = ref(false) | ||
| const adoption = ref<ReturnType<typeof getLatestDayVersionAdoption>>(null) | ||
| let requestToken = 0 | ||
|
|
||
| const percentLabel = computed(() => { | ||
| const percent = adoption.value?.percent ?? 0 | ||
| return `${formatNumberValue(percent, { minimumFractionDigits: 1, maximumFractionDigits: 1 })}%` | ||
| }) | ||
|
|
||
| const countLabel = computed(() => formatNumberValue(adoption.value?.count ?? 0)) | ||
| const totalLabel = computed(() => formatNumberValue(adoption.value?.total ?? 0)) | ||
| const hasDevices = computed(() => (adoption.value?.total ?? 0) > 0) | ||
|
|
||
| async function loadAdoption() { | ||
| if (!props.appId || !props.versionName) { | ||
| adoption.value = null | ||
| loadError.value = false | ||
| loading.value = false | ||
| return | ||
| } | ||
|
|
||
| const currentToken = ++requestToken | ||
| loading.value = true | ||
| loadError.value = false | ||
| try { | ||
| const { startDate, endDate } = getChartDateRange(false) | ||
| const data = await useChartData(supabase, props.appId, startDate, endDate, 'bundle') | ||
| if (currentToken !== requestToken) | ||
| return | ||
| if (!data) { | ||
| loadError.value = true | ||
| adoption.value = null | ||
| return | ||
| } | ||
| adoption.value = getLatestDayVersionAdoption(data.datasets ?? [], props.versionName) | ||
| } | ||
| catch (error) { | ||
| console.error('[BundleAdoptionCard] Failed to load adoption', error) | ||
| if (currentToken !== requestToken) | ||
| return | ||
| loadError.value = true | ||
| adoption.value = null | ||
| } | ||
| finally { | ||
| if (currentToken === requestToken) | ||
| loading.value = false | ||
| } | ||
| } | ||
|
|
||
| function openDevices() { | ||
| router.push({ | ||
| path: `/app/${props.appId}/devices`, | ||
| query: { version: props.versionName }, | ||
| }) | ||
| } | ||
|
|
||
| function openChannelStats() { | ||
| if (!props.linkedChannelId) | ||
| return | ||
| router.push(`/app/${props.appId}/channel/${props.linkedChannelId}/statistics`) | ||
| } | ||
|
|
||
| watch(() => [props.appId, props.versionName] as const, () => { | ||
| void loadAdoption() | ||
| }, { immediate: true }) | ||
| </script> | ||
|
|
||
| <template> | ||
| <section | ||
| data-test="bundle-adoption-card" | ||
| class="p-4 border rounded-lg shadow-sm" | ||
| :class="hasDevices | ||
| ? 'bg-sky-50 border-sky-200 dark:bg-sky-950/20 dark:border-sky-800' | ||
| : 'bg-white border-slate-200 dark:bg-slate-800 dark:border-slate-700'" | ||
| > | ||
| <div class="flex flex-col gap-4" :class="{ 'lg:flex-row lg:items-center lg:justify-between': compact }"> | ||
| <div class="flex items-start gap-3 min-w-0"> | ||
| <IconTrendingUp class="w-6 h-6 mt-0.5 shrink-0 text-sky-600 dark:text-sky-300" /> | ||
| <div class="min-w-0"> | ||
| <h3 class="font-semibold text-slate-900 dark:text-white"> | ||
| {{ t('bundle-adoption') }} | ||
| </h3> | ||
| <p class="mt-1 text-sm text-slate-600 dark:text-slate-300"> | ||
| <template v-if="loading"> | ||
| {{ t('loading-statistics') }} | ||
| </template> | ||
| <template v-else-if="loadError"> | ||
| {{ t('bundle-adoption-error', { version: versionName }) }} | ||
| </template> | ||
| <template v-else-if="hasDevices"> | ||
| {{ t('bundle-adoption-help', { | ||
| version: versionName, | ||
| count: countLabel, | ||
| total: totalLabel, | ||
| percent: percentLabel, | ||
| }) }} | ||
| </template> | ||
| <template v-else> | ||
| {{ t('bundle-adoption-empty', { version: versionName }) }} | ||
| </template> | ||
| </p> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div v-if="!loading && !loadError" class="flex flex-col gap-3 min-w-0" :class="{ 'lg:w-80': compact }"> | ||
| <div class="flex items-baseline gap-2"> | ||
| <span class="text-2xl font-semibold tabular-nums text-slate-900 dark:text-white"> | ||
| {{ percentLabel }} | ||
| </span> | ||
| <span class="text-sm text-slate-600 dark:text-slate-300"> | ||
| {{ t('bundle-adoption-devices', { count: countLabel, total: totalLabel }) }} | ||
| </span> | ||
| </div> | ||
| <progress | ||
| class="w-full h-2 d-progress d-progress-info" | ||
| :value="adoption?.percent ?? 0" | ||
| max="100" | ||
| :aria-label="t('bundle-adoption')" | ||
| /> | ||
| <div class="flex flex-wrap gap-2"> | ||
| <button | ||
| type="button" | ||
| class="gap-2 d-btn d-btn-sm d-btn-outline" | ||
| data-test="bundle-adoption-devices" | ||
| @click="openDevices" | ||
| > | ||
| <IconSmartphone class="w-4 h-4" /> | ||
| {{ t('view-bundle-devices') }} | ||
| </button> | ||
| <button | ||
| v-if="linkedChannelId" | ||
| type="button" | ||
| class="gap-2 d-btn d-btn-sm d-btn-primary" | ||
| data-test="bundle-adoption-channel" | ||
| @click="openChannelStats" | ||
| > | ||
| <IconTrendingUp class="w-4 h-4" /> | ||
| {{ linkedChannelName ? t('view-channel-adoption-named', { channel: linkedChannelName }) : t('view-channel-adoption') }} | ||
| </button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </section> | ||
| </template> |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.