From b843603bb1e91e5c112efeb53bfc0ad00dc606d9 Mon Sep 17 00:00:00 2001 From: Alf Eaton Date: Wed, 9 Jul 2025 13:47:40 +0100 Subject: [PATCH] Use data-type="number" for numeric meta values (#26775) GitOrigin-RevId: 844f56383457ee7f2043af553b7dd5ae1b33f8a9 --- services/web/app/views/project/editor/_meta.pug | 4 ++-- services/web/app/views/user/settings.pug | 2 +- .../web/app/views/user_membership/group-members-react.pug | 2 +- .../group-management/components/add-seats/add-seats.tsx | 2 +- services/web/frontend/js/utils/meta.ts | 3 ++- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/services/web/app/views/project/editor/_meta.pug b/services/web/app/views/project/editor/_meta.pug index 9eca3a5b69..f45ce6aaf2 100644 --- a/services/web/app/views/project/editor/_meta.pug +++ b/services/web/app/views/project/editor/_meta.pug @@ -9,8 +9,8 @@ meta(name="ol-anonymous" data-type="boolean" content=anonymous) meta(name="ol-brandVariation" data-type="json" content=brandVariation) meta(name="ol-isTokenMember" data-type="boolean" content=isTokenMember) meta(name="ol-isRestrictedTokenMember" data-type="boolean" content=isRestrictedTokenMember) -meta(name="ol-maxDocLength" data-type="json" content=maxDocLength) -meta(name="ol-maxReconnectGracefullyIntervalMs" data-type="json" content=maxReconnectGracefullyIntervalMs) +meta(name="ol-maxDocLength" data-type="number" content=maxDocLength) +meta(name="ol-maxReconnectGracefullyIntervalMs" data-type="number" content=maxReconnectGracefullyIntervalMs) meta(name="ol-wikiEnabled" data-type="boolean" content=settings.proxyLearn) meta(name="ol-capabilities" data-type="json" content=capabilities) meta(name="ol-projectHistoryBlobsEnabled" data-type="boolean" content=projectHistoryBlobsEnabled) diff --git a/services/web/app/views/user/settings.pug b/services/web/app/views/user/settings.pug index dc63e27abe..45d21c7572 100644 --- a/services/web/app/views/user/settings.pug +++ b/services/web/app/views/user/settings.pug @@ -46,7 +46,7 @@ block append meta data-type='json' content=personalAccessTokens ) - meta(name='ol-emailAddressLimit' data-type='json' content=emailAddressLimit) + meta(name='ol-emailAddressLimit' data-type='number' content=emailAddressLimit) meta( name='ol-currentManagedUserAdminEmail' data-type='string' diff --git a/services/web/app/views/user_membership/group-members-react.pug b/services/web/app/views/user_membership/group-members-react.pug index 4020ebdf58..7767cf026e 100644 --- a/services/web/app/views/user_membership/group-members-react.pug +++ b/services/web/app/views/user_membership/group-members-react.pug @@ -8,7 +8,7 @@ block append meta meta(name='ol-users' data-type='json' content=users) meta(name='ol-groupId' data-type='string' content=groupId) meta(name='ol-groupName' data-type='string' content=name) - meta(name='ol-groupSize' data-type='json' content=groupSize) + meta(name='ol-groupSize' data-type='number' content=groupSize) meta( name='ol-managedUsersActive' data-type='boolean' diff --git a/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx b/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx index ab9f96a975..5f9237807d 100644 --- a/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx +++ b/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx @@ -44,7 +44,7 @@ function AddSeats() { const { t } = useTranslation() const groupName = getMeta('ol-groupName') const subscriptionId = getMeta('ol-subscriptionId') - const totalLicenses = Number(getMeta('ol-totalLicenses')) + const totalLicenses = getMeta('ol-totalLicenses') const isProfessional = getMeta('ol-isProfessional') const isCollectionMethodManual = getMeta('ol-isCollectionMethodManual') const [addSeatsInputError, setAddSeatsInputError] = useState() diff --git a/services/web/frontend/js/utils/meta.ts b/services/web/frontend/js/utils/meta.ts index 849c7eb4c1..908838c38f 100644 --- a/services/web/frontend/js/utils/meta.ts +++ b/services/web/frontend/js/utils/meta.ts @@ -159,7 +159,7 @@ export interface Meta { 'ol-languages': SpellCheckLanguage[] 'ol-learnedWords': string[] 'ol-legacyEditorThemes': string[] - 'ol-licenseQuantity': number | undefined + 'ol-licenseQuantity'?: number 'ol-loadingText': string 'ol-managedGroupSubscriptions': ManagedGroupSubscription[] 'ol-managedInstitutions': ManagedInstitution[] @@ -320,6 +320,7 @@ export default function getMeta(name: T): Meta[T] { value = element.hasAttribute('content') break case 'json': + case 'number': if (!plainTextValue) { // JSON.parse('') throws value = undefined