diff --git a/pkg/webui/components/key-value-map/entry.js b/pkg/webui/components/key-value-map/entry.js index b509198db9..c608778d46 100644 --- a/pkg/webui/components/key-value-map/entry.js +++ b/pkg/webui/components/key-value-map/entry.js @@ -140,7 +140,7 @@ const Entry = ({ value={indexAsKey ? value : value.value} readOnly={readOnly} code - options={options ? newOptions ?? options : undefined} + options={options ? (newOptions ?? options) : undefined} {...additionalInputPropsRest} /> {showRemoveButton && ( diff --git a/pkg/webui/components/table/index.js b/pkg/webui/components/table/index.js index 25fb719aa6..93d2473147 100644 --- a/pkg/webui/components/table/index.js +++ b/pkg/webui/components/table/index.js @@ -120,7 +120,7 @@ const Tabular = ({ const paginatedData = handlePagination(data) const rows = paginatedData.map((row, rowIndex) => { // If the whole table is disabled each row should be as well. - const rowClickable = !clickable ? false : row._meta?.clickable ?? clickable + const rowClickable = !clickable ? false : (row._meta?.clickable ?? clickable) return ( { (values, profile, entityId, isNonSharedProfile) => ({ ...values.wifi_profile, ...(isNonSharedProfile && { ...profile.data }), - profile_id: isNonSharedProfile ? 'non-shared' : selectedManagedGateway.wifi_profile_id ?? '', + profile_id: isNonSharedProfile + ? 'non-shared' + : (selectedManagedGateway.wifi_profile_id ?? ''), _override: !Boolean(profile) && hasWifiProfileSet, _profile_of: entityId ?? '', }),