Explorar el Código

Use data-type="number" for numeric meta values (#26775)

GitOrigin-RevId: 844f56383457ee7f2043af553b7dd5ae1b33f8a9
Alf Eaton hace 1 año
padre
commit
b843603bb1

+ 2 - 2
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)

+ 1 - 1
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'

+ 1 - 1
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'

+ 1 - 1
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<string>()

+ 2 - 1
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<T extends keyof Meta>(name: T): Meta[T] {
       value = element.hasAttribute('content')
       break
     case 'json':
+    case 'number':
       if (!plainTextValue) {
         // JSON.parse('') throws
         value = undefined