@servicenow/sdk-build-plugins 4.5.0 → 4.6.0

package/src/record-plugin.ts

@@ -16,6 +16,7 @@ import {
 import {
     ServicePortal,
     SPWidget,
+    SPHeaderFooter,
     SPAngularProvider,
     SPWidgetDependency,
     CssInclude,
@@ -23,6 +24,7 @@ import {
     SPPage,
     SPTheme,
     SPMenu,
+    SPPageRouteMap,
 } from '@servicenow/sdk-core/runtime/service-portal'
 import {
     CatalogItem,
@@ -33,11 +35,12 @@ import {
 } from '@servicenow/sdk-core/runtime/service-catalog'
 import { ClientScript } from '@servicenow/sdk-core/runtime/clientscript'
 import { ScriptAction, ScriptInclude, ScheduledScript } from '@servicenow/sdk-core/runtime/sys'
-import { List } from '@servicenow/sdk-core/runtime/ui'
+import { List, Form } from '@servicenow/sdk-core/runtime/ui'
 import { Table } from '@servicenow/sdk-core/runtime/db'
 import { RestApi } from '@servicenow/sdk-core/runtime/rest'
-import { EmailNotification } from '@servicenow/sdk-core/runtime/notification'
+import { EmailNotification, InboundEmailAction } from '@servicenow/sdk-core/runtime/notification'
 import { UiAction, UiPage, UiPolicy } from '@servicenow/sdk-core/runtime/ui'
+import { ActionStepDefinition } from '@servicenow/sdk-core/runtime/flow'
 import { Applicability, UxListMenuConfig, Workspace } from '@servicenow/sdk-core/runtime/uxf'
 import { Dashboard } from '@servicenow/sdk-core/runtime/dashboard'
 import { ColumnTypeCheck, LinterCheck, ScriptOnlyCheck, TableCheck } from '@servicenow/sdk-core/runtime/instancescan'
@@ -223,6 +226,10 @@ export const TableOwnership = {
     sys_script: BusinessRule.name,
     sys_script_client: ClientScript.name,
     sys_scope_privilege: CrossScopePrivilege.name,
+    sys_ui_form: Form.name,
+    sys_ui_section: Form.name,
+    sys_ui_form_section: Form.name,
+    sys_ui_element: Form.name,
     sys_ui_list_element: List.name,
     sys_ui_list: List.name,
     sys_properties: Property.name,
@@ -230,6 +237,7 @@ export const TableOwnership = {
     sys_user_role_contains: Role.name,
     sys_script_include: ScriptInclude.name,
     sp_widget: SPWidget.name,
+    sp_header_footer: SPHeaderFooter.name,
     m2m_sp_widget_dependency: SPWidget.name,
     m2m_sp_ng_pro_sp_widget: SPWidget.name,
     sp_portal: ServicePortal.name,
@@ -248,6 +256,7 @@ export const TableOwnership = {
     m2m_sp_ng_pro_sp_ng_pro: SPAngularProvider.name,
     sp_instance_menu: SPMenu.name,
     sp_rectangle_menu_item: SPMenu.name,
+    sp_page_route_map: SPPageRouteMap.name,
     sys_atf_test: Test.name,
     sys_ws_header_map: RestApi.name,
     sys_ws_query_parameter_map: RestApi.name,
@@ -267,6 +276,7 @@ export const TableOwnership = {
     sysevent_script_action: ScriptAction.name,
     sysauto_script: ScheduledScript.name,
     sysevent_email_action: EmailNotification.name,
+    sysevent_in_email_action: InboundEmailAction.name,
     sys_db_object: Table.name,
     sys_dictionary: Table.name,
     sys_hub_flow: 'Flow',
@@ -274,10 +284,10 @@ export const TableOwnership = {
     sys_hub_action_instance_v2: 'wfa.action',
     sys_hub_sub_flow_instance_v2: 'wfa.subflow',
     sys_hub_flow_logic_instance_v2: 'wfa.flowLogic',
-    sys_flow_step_definition: 'ActionStepDefinition',
+    sys_flow_step_definition: ActionStepDefinition.name,
     sys_decision: 'DecisionTablePlugin',
     sys_hub_action_type_definition: 'Action',
-    sys_hub_step_instance: 'wfa.action_step',
+    sys_hub_step_instance: 'wfa.actionStep',
     sp_theme: SPTheme.name,
     m2m_sp_theme_css_include: SPTheme.name,
     m2m_sp_theme_js_include: SPTheme.name,

package/src/rest-api-plugin.ts

@@ -183,6 +183,7 @@ async function generateRouteAttributeRecords(
             installCategory: restDef.getInstallCategory(),
         })
 
+        const isShared = attrMap.has(attrRecord.getId().getValue())
         checkForDuplicateRecords(attrMap, attrRecord, attr.asObject(), diagnostics)
 
         const attributeMappingRecord = await factory.createRecord({
@@ -195,7 +196,12 @@ async function generateRouteAttributeRecords(
             installCategory: restDef.getInstallCategory(),
         })
 
-        records.push(attrRecord.with(attributeMappingRecord))
+        if (isShared) {
+            // The attrRecord was already emitted by a previous route — only emit the mapping
+            records.push(attributeMappingRecord)
+        } else {
+            records.push(attrRecord.with(attributeMappingRecord))
+        }
     }
 
     return records

package/src/schedule-script/scheduled-script-plugin.ts

@@ -9,6 +9,7 @@ import {
 } from '@servicenow/sdk-build-core'
 import { NowIdShape } from '../now-id-plugin'
 import { NowIncludeShape } from '../now-include-plugin'
+import { ModuleFunctionShape } from '../server-module-plugin'
 import { createSdkDocEntry, toReference } from '../utils'
 import { dateTimeFieldToXML, convertXMLToDateTime, formatTimeDataToDateTime, formatToUTC } from './timeZoneConverter'
 
@@ -444,13 +445,21 @@ export const ScheduledScriptPlugin = Plugin.create({
         {
             shape: CallExpressionShape,
             fileTypes: ['fluent'],
-            async toRecord(callExpression, { factory, diagnostics }) {
+            async toRecord(callExpression, { factory, diagnostics, config }) {
                 if (callExpression.getCallee() !== 'ScheduledScript') {
                     return { success: false }
                 }
 
                 const args = callExpression.getArgument(0).asObject()
 
+                // Check if script is unresolved module
+                if (args.get('script').isUnresolved()) {
+                    diagnostics.error(
+                        args.get('script').getOriginalNode(),
+                        `Unable to resolve the script reference, ensure the imported module is within the ${config.serverModulesDir} directory.`
+                    )
+                }
+
                 // Validate executionInterval is defined when frequency is 'periodically'
                 const frequency = args.get('frequency').ifString()?.getValue()
                 if (frequency === 'periodically' && args.get('executionInterval').isUndefined()) {
@@ -667,8 +676,10 @@ export const ScheduledScriptPlugin = Plugin.create({
                         // Protection policy
                         sys_policy: $.from('protectionPolicy'),
 
-                        // Script
-                        script: $.toCdata(),
+                        // Script - handle both module functions and strings
+                        script: $.map(
+                            (v) => v.if(ModuleFunctionShape)?.toString((n) => `${n}({{PARAMS}})`, []) ?? v
+                        ).toCdata(),
                     })),
                 })
 

package/src/service-catalog/service-catalog-base.ts

@@ -255,6 +255,17 @@ export function transformCatalogBaseFieldsToShape(record: Record, $: ShapeTransf
         visibleBundle: $.from('visible_bundle').toBoolean().def(true),
         visibleGuide: $.from('visible_guide').toBoolean().def(true),
         visibleStandalone: $.from('visible_standalone').toBoolean().def(true),
+        hideAddToCart: $.from('no_cart_v2').toBoolean().def(false),
+        hideAddToWishList: $.from('no_wishlist_v2').toBoolean().def(false),
+        hideDeliveryTime: $.from('no_delivery_time_v2').toBoolean().def(false),
+        hideQuantitySelector: $.from('no_quantity_v2').toBoolean().def(false),
+        hideSP: $.from('hide_sp').toBoolean().def(false),
+        image: $.def(''),
+        model: $.def(''),
+        mobilePictureType: $.from('mobile_picture_type')
+            .map((v: Shape) => getMobilePictureTypeFromDb(v.toString().getValue()))
+            .def('desktopPicture'),
+        makeItemNonConversational: $.from('make_item_non_conversational').toBoolean().def(false),
     }
 }
 
@@ -327,6 +338,17 @@ export function transformCatalogItemBaseFieldsToRecord($: ShapeTransform) {
         visible_bundle: $.from('visibleBundle').def(true),
         visible_guide: $.from('visibleGuide').def(true),
         visible_standalone: $.from('visibleStandalone').def(true),
+        no_cart_v2: $.from('hideAddToCart').def(false),
+        no_wishlist_v2: $.from('hideAddToWishList').def(false),
+        no_delivery_time_v2: $.from('hideDeliveryTime').def(false),
+        no_quantity_v2: $.from('hideQuantitySelector').def(false),
+        hide_sp: $.from('hideSP').def(false),
+        image: $.def(''),
+        model: $.def(''),
+        mobile_picture_type: $.from('mobilePictureType')
+            .map((v: Shape) => getMobilePictureTypeToDb(v.toString().getValue()))
+            .def('use_desktop_picture'),
+        make_item_non_conversational: $.from('makeItemNonConversational').def(false),
     }
 }
 
@@ -375,9 +397,6 @@ export function transformCatalogItemSpecificFieldsToShape(record: Record, $: Sha
         requestMethod: $.from('request_method')
             .map((v: Shape) => (v.ifString()?.isEmpty() ? undefined : v.getValue()))
             .def('order'),
-        hideAddToCart: $.from('no_cart_v2').toBoolean().def(false),
-        hideQuantitySelector: $.from('no_quantity_v2').toBoolean().def(false),
-        hideDeliveryTime: $.from('no_delivery_time_v2').toBoolean().def(false),
         customCart: $.from('custom_cart').def(''),
         recurringFrequency: $.from('recurring_frequency').def(''),
 
@@ -388,16 +407,8 @@ export function transformCatalogItemSpecificFieldsToShape(record: Record, $: Sha
         noProceedCheckout: $.from('no_proceed_checkout').toBoolean().def(false),
         noQuantity: $.from('no_quantity').toBoolean().def(false),
         noSearch: $.from('no_search').toBoolean().def(false),
-        hideAddToWishList: $.from('no_wishlist_v2').toBoolean().def(false),
 
         // Additional fields
-        hideSP: $.from('hide_sp').toBoolean().def(false),
-        image: $.def(''),
-        makeItemNonConversational: $.from('make_item_non_conversational').toBoolean().def(false),
-        mobilePictureType: $.from('mobile_picture_type')
-            .map((v: Shape) => getMobilePictureTypeFromDb(v.toString().getValue()))
-            .def('desktopPicture'),
-        model: $.def(''),
         vendor: $.def(''),
         location: $.def(''),
     }
@@ -448,9 +459,6 @@ export function transformCatalogItemSpecificFieldsToRecord(arg: ObjectShape, $:
         request_method: $.from('requestMethod')
             .map((v: Shape) => (v.ifString()?.getValue() === 'order' ? '' : v.getValue()))
             .def(''),
-        no_cart_v2: $.from('hideAddToCart').def(false),
-        no_quantity_v2: $.from('hideQuantitySelector').def(false),
-        no_delivery_time_v2: $.from('hideDeliveryTime').def(false),
         custom_cart: $.from('customCart').def(''),
         recurring_frequency: $.from('recurringFrequency').def(''),
 
@@ -461,16 +469,8 @@ export function transformCatalogItemSpecificFieldsToRecord(arg: ObjectShape, $:
         no_proceed_checkout: $.from('noProceedCheckout').def(false),
         no_quantity: $.from('noQuantity').def(false),
         no_search: $.from('noSearch').def(false),
-        no_wishlist_v2: $.from('hideAddToWishList').def(false),
 
         // Additional
-        hide_sp: $.from('hideSP').def(false),
-        image: $.def(''),
-        make_item_non_conversational: $.from('makeItemNonConversational').def(false),
-        mobile_picture_type: $.from('mobilePictureType')
-            .map((v: Shape) => getMobilePictureTypeToDb(v.toString().getValue()))
-            .def('use_desktop_picture'),
-        model: $.def(''),
         vendor: $.def(''),
         location: $.def(''),
     }

package/src/service-portal/header-footer-plugin.ts

@@ -0,0 +1,57 @@
+import { CallExpressionShape, Plugin } from '@servicenow/sdk-build-core'
+import { createSdkDocEntry } from '../utils'
+import { createWidgetToRecord, createWidgetToShape } from './utils'
+import {
+    getDefaultClientScript,
+    SP_WIDGET_DEFAULT_HTML_TEMPLATE,
+    SP_WIDGET_DEFAULT_LINK_SCRIPT,
+    SP_WIDGET_DEFAULT_SERVER_SCRIPT,
+} from './widget-plugin'
+
+export const SPHeaderFooterPlugin = Plugin.create({
+    name: 'SPHeaderFooterPlugin',
+    docs: [createSdkDocEntry('SPHeaderFooter', ['sp_header_footer'])],
+    records: {
+        sp_header_footer: {
+            relationships: {
+                m2m_sp_widget_dependency: { via: 'sp_widget', descendant: true },
+                m2m_sp_ng_pro_sp_widget: { via: 'sp_widget', descendant: true },
+                sp_ng_template: { via: 'sp_widget', descendant: true },
+            },
+            async toShape(record, { descendants }) {
+                return createWidgetToShape(record, descendants, 'SPHeaderFooter', 'sp_header_footer', true)
+            },
+        },
+        m2m_sp_widget_dependency: {
+            coalesce: ['sp_widget', 'sp_dependency'],
+        },
+        m2m_sp_ng_pro_sp_widget: {
+            coalesce: ['sp_widget', 'sp_angular_provider'],
+        },
+    },
+    shapes: [
+        {
+            shape: CallExpressionShape,
+            fileTypes: ['fluent'],
+            async toRecord(callExpression, { diagnostics, factory, config }) {
+                if (callExpression.getCallee() !== 'SPHeaderFooter') {
+                    return { success: false }
+                }
+
+                return createWidgetToRecord(
+                    callExpression,
+                    { diagnostics, factory, config },
+                    {
+                        callee: 'SPHeaderFooter',
+                        table: 'sp_header_footer',
+                        includeStaticField: true,
+                        getDefaultClientScript,
+                        defaultServerScript: SP_WIDGET_DEFAULT_SERVER_SCRIPT,
+                        defaultLinkScript: SP_WIDGET_DEFAULT_LINK_SCRIPT,
+                        defaultHtmlTemplate: SP_WIDGET_DEFAULT_HTML_TEMPLATE,
+                    }
+                )
+            },
+        },
+    ],
+})

package/src/service-portal/menu-plugin.ts

@@ -10,6 +10,7 @@ import {
 import { NowIdShape } from '../now-id-plugin'
 import { NowIncludeShape } from '../now-include-plugin'
 import { toReference, getFieldAsNumber, noThrow, createSdkDocEntry } from '../utils'
+import { getRolesString } from './utils'
 
 const default_placeholder_dimensions = `{
 	"mobile": {
@@ -73,29 +74,6 @@ const defaultValues = {
     },
 }
 
-function getRolesString(rolesShape: Shape, diagnostics: Diagnostics): string {
-    const roles = rolesShape
-        ?.ifArray()
-        ?.map((role) => {
-            if (role.isString()) {
-                return role.getValue()
-            }
-            if (role.isRecord()) {
-                const name = role.get('name')
-                if (name?.isString()) {
-                    return name.getValue()
-                }
-                return role.getId()
-            }
-
-            diagnostics.error(role, `roles must be strings or role records`)
-            return undefined
-        })
-        .filter((r) => r) as string[] | undefined
-
-    return roles?.toString() ?? ''
-}
-
 const addProperty = (obj: { [key: string]: unknown }, key: string, value: unknown) => {
     if (
         value === undefined ||

package/src/service-portal/page-plugin.ts

@@ -6,11 +6,11 @@ import {
     type Record,
     type RecordId,
     type Shape,
-    type ArrayShape,
     type ObjectShape,
 } from '@servicenow/sdk-build-core'
 import isEmpty from 'lodash/isEmpty'
 import { toReference, getFieldAsNumber, createSdkDocEntry } from '../utils'
+import { getRolesString } from './utils'
 
 type Dict = { [key: string]: unknown }
 
@@ -292,29 +292,6 @@ function getInstanceObject(instance: Record): object | undefined {
     return instanceObject
 }
 
-/**
- * Converts an ArrayShape of roles to a comma-separated string.
- * Handles both role record objects and string values, removes duplicates and empty values.
- * @param roles - ArrayShape containing role records or strings
- * @returns Comma-separated string of unique role names or undefined if no roles
- */
-function getRolesString(roles: ArrayShape | undefined): string | undefined {
-    if (!roles) {
-        return
-    }
-    const uniqueRoles = [
-        ...new Set(
-            roles.getElements().map((role) => {
-                const roleName = role.isRecord()
-                    ? role.get('name')?.ifString()?.getValue()
-                    : role.ifString()?.getValue()
-                return (roleName ?? '').trim()
-            })
-        ),
-    ]
-    return uniqueRoles.filter((role) => role !== '').join(',')
-}
-
 /**
  * Recursively processes nested rows within a column
  * @param columnRows - Rows that belong to the column
@@ -548,8 +525,7 @@ async function createInstanceRecords(instancesArray: Shape[], columnId: RecordId
             const instance = instanceShape.asObject()
 
             // Process roles if they exist as an array
-            const rolesArray = instance.get('roles').ifArray()
-            const rolesString = getRolesString(rolesArray)
+            const rolesString = getRolesString(instance.get('roles'))
 
             const instanceRecord = await factory.createRecord({
                 source: instanceShape,
@@ -749,8 +725,7 @@ export const SPPagePlugin = Plugin.create({
                 }
 
                 // Process roles if they exist as an array
-                const rolesArray = page.get('roles').ifArray()
-                const rolesString = getRolesString(rolesArray)
+                const rolesString = getRolesString(page.get('roles'))
 
                 const pageIdShape = page.get('pageId')
                 const pageId = pageIdShape.asString().getValue()

package/src/service-portal/page-route-map-plugin.ts

@@ -0,0 +1,124 @@
+import { CallExpressionShape, Plugin, type Shape } from '@servicenow/sdk-build-core'
+import { NowIdShape } from '../now-id-plugin'
+import { toReference, createSdkDocEntry } from '../utils'
+import { getRolesString } from './utils'
+
+function getPortalsString(portalsShape: Shape): string {
+    const portals = portalsShape
+        .ifArray()
+        ?.getElements()
+        .map((p) => {
+            const ref = toReference(p)
+            return typeof ref === 'string' ? ref : ref.getValue()
+        })
+        .filter((id) => id !== '')
+
+    if (!portals || portals.length === 0) {
+        return ''
+    }
+    return [...new Set(portals)].join(',')
+}
+
+export const SPPageRouteMapPlugin = Plugin.create({
+    name: 'SPPageRouteMapPlugin',
+    docs: [createSdkDocEntry('SPPageRouteMap', ['sp_page_route_map'])],
+    records: {
+        sp_page_route_map: {
+            coalesce: ['route_from_page', 'portals'],
+            toShape(record) {
+                const portalsStr = record.get('portals').ifString()?.getValue() ?? ''
+                const portalsArray = portalsStr
+                    ? portalsStr
+                          .split(',')
+                          .map((p) => p.trim())
+                          .filter((p) => p !== '')
+                    : []
+
+                const rolesStr = record.get('roles').ifString()?.getValue() ?? ''
+                const rolesArray = rolesStr
+                    ? rolesStr
+                          .split(',')
+                          .map((r) => r.trim())
+                          .filter((r) => r !== '')
+                    : []
+
+                return {
+                    success: true,
+                    value: new CallExpressionShape({
+                        source: record,
+                        callee: 'SPPageRouteMap',
+                        args: [
+                            record.transform(({ $ }) => {
+                                const config: { [key: string]: typeof $ | undefined } = {
+                                    $id: $.val(NowIdShape.from(record)),
+                                    routeFromPage: $.from('route_from_page'),
+                                    routeToPage: $.from('route_to_page'),
+                                    shortDescription: $.from('short_description').def(''),
+                                    active: $.from('active').toBoolean().def(true),
+                                    order: $.from('order').toNumber().def(10),
+                                }
+                                if (portalsArray.length > 0) {
+                                    config['portals'] = $.val(portalsArray)
+                                }
+                                if (rolesArray.length > 0) {
+                                    config['roles'] = $.val(rolesArray)
+                                }
+                                return config
+                            }),
+                        ],
+                    }),
+                }
+            },
+        },
+    },
+    shapes: [
+        {
+            shape: CallExpressionShape,
+            fileTypes: ['fluent'],
+            async toRecord(callExpression, { factory, diagnostics }) {
+                if (callExpression.getCallee() !== 'SPPageRouteMap') {
+                    return { success: false }
+                }
+
+                const args = callExpression.getArgument(0).asObject()
+
+                const routeFromShape = args.get('routeFromPage')
+                const routeToShape = args.get('routeToPage')
+                const routeFromRef = toReference(routeFromShape)
+                const routeToRef = toReference(routeToShape)
+                const routeFromStr = typeof routeFromRef === 'string' ? routeFromRef : routeFromRef.getValue()
+                const routeToStr = typeof routeToRef === 'string' ? routeToRef : routeToRef.getValue()
+
+                if (routeFromStr !== '' && routeToStr !== '' && routeFromStr === routeToStr) {
+                    diagnostics.error(
+                        routeToShape.getOriginalNode(),
+                        `Invalid SPPageRouteMap: "routeToPage" must be different from "routeFromPage".`
+                    )
+                }
+
+                const portalsString = getPortalsString(args.get('portals'))
+                const rolesString = getRolesString(args.get('roles'), diagnostics)
+
+                const routeMapRecord = await factory.createRecord({
+                    source: callExpression,
+                    table: 'sp_page_route_map',
+                    explicitId: args.get('$id'),
+                    properties: args.transform(({ $ }) => ({
+                        route_from_page: $.from('routeFromPage').map(toReference).def(''),
+                        route_to_page: $.from('routeToPage').map(toReference).def(''),
+                        short_description: $.from('shortDescription').def(''),
+                        portals: $.val(portalsString).def(''),
+                        roles: $.val(rolesString).def(''),
+                        active: $.def(true),
+                        order: $.def(10),
+                    })),
+                })
+
+                return {
+                    success: true,
+                    value: routeMapRecord,
+                }
+            },
+        },
+    ],
+})

package/src/service-portal/portal-plugin.ts

@@ -173,17 +173,40 @@ export const ServicePortalPlugin = Plugin.create({
                         )
                     }
                 }
-                // Extract first catalog and knowledgeBase from arrays to populate portal fields
                 const catalogsForM2M = portalArgs.get('catalogs')?.ifArray()?.getElements() ?? []
                 const knowledgeBasesForM2M = portalArgs.get('knowledgeBases')?.ifArray()?.getElements() ?? []
-                const firstCatalogFromArray =
-                    catalogsForM2M.length > 0 ? catalogsForM2M[0]?.asObject()?.get('catalog') : undefined
-                const firstKnowledgeBaseFromArray =
-                    knowledgeBasesForM2M.length > 0
-                        ? knowledgeBasesForM2M[0]?.asObject()?.get('knowledgeBase')
-                        : undefined
 
-                // Build portal properties with conditional catalog and knowledgeBase
+                const deprecatedKnowledgeBase = portalArgs.get('knowledgeBase')
+                if (deprecatedKnowledgeBase?.isDefined()) {
+                    if (knowledgeBasesForM2M.length > 0) {
+                        diagnostics.error(
+                            deprecatedKnowledgeBase.getOriginalNode(),
+                            `Cannot use both 'knowledgeBase' and 'knowledgeBases'. Remove 'knowledgeBase' and use only the 'knowledgeBases' array instead.`
+                        )
+                    } else {
+                        diagnostics.warn(
+                            deprecatedKnowledgeBase.getOriginalNode(),
+                            `'knowledgeBase' is deprecated. Use the 'knowledgeBases' array instead.`
+                        )
+                    }
+                }
+
+                const deprecatedCatalog = portalArgs.get('catalog')
+                if (deprecatedCatalog?.isDefined()) {
+                    if (catalogsForM2M.length > 0) {
+                        diagnostics.error(
+                            deprecatedCatalog.getOriginalNode(),
+                            `Cannot use both 'catalog' and 'catalogs'. Remove 'catalog' and use only the 'catalogs' array instead.`
+                        )
+                    } else {
+                        diagnostics.warn(
+                            deprecatedCatalog.getOriginalNode(),
+                            `'catalog' is deprecated. Use the 'catalogs' array instead.`
+                        )
+                    }
+                }
+
+                // Build portal properties
                 const baseProperties = portalArgs.transform(({ $ }) => ({
                     title: $,
                     url_suffix: $.from('urlSuffix').def(''),
@@ -203,13 +226,13 @@ export const ServicePortalPlugin = Plugin.create({
                     search_application: $.from('searchApplication'),
                     alternate_portal: $.from('alternatePortal'),
                     sc_catalog_page: $.from('catalogHomePage'),
-                    sc_catalog: $.val(firstCatalogFromArray),
-                    kb_knowledge_base: $.val(firstKnowledgeBaseFromArray),
                     login_page: $.from('loginPage'),
                     kb_knowledge_page: $.from('knowledgeHomePage'),
                     sp_chat_queue: $.from('chatQueue'),
                     notfound_page: $.from('notFoundPage'),
                     ts_index_group: $.from('textIndexGroup'),
+                    ...(knowledgeBasesForM2M.length === 0 ? { kb_knowledge_base: $.from('knowledgeBase') } : {}),
+                    ...(catalogsForM2M.length === 0 ? { sc_catalog: $.from('catalog') } : {}),
                     enable_ais: $.from('enableAiSearch').def(false),
                     enable_certificate_based_authentication: $.from('enableCertificateBasedAuthentication').def(false),
                     default: $.from('defaultPortal').def(false),