Merge branch 'develop' into docs/ucc_version

Author: hetangmodi-crest

NOTICE

@@ -1,5 +1,21 @@
 # Changelog
 
+# [6.1.0](https://github.com/splunk/addonfactory-ucc-generator/compare/v6.0.1...v6.1.0) (2025-11-13)
+
+
+### Bug Fixes
+
+* include built UI files in the wheel package ([#1927](https://github.com/splunk/addonfactory-ucc-generator/issues/1927)) ([0e83b49](https://github.com/splunk/addonfactory-ucc-generator/commit/0e83b490468bfb19bff3bb0634ad172caa5a044e))
+* **UI:** respect allowed "mode" in "modifyFieldsOnValue" ([#1951](https://github.com/splunk/addonfactory-ucc-generator/issues/1951)) ([b2bf2d1](https://github.com/splunk/addonfactory-ucc-generator/commit/b2bf2d192b112f062e1d61870b8dc0cfeaaf5f64))
+
+
+### Features
+
+* add a new flag overwrite for build command ([#1916](https://github.com/splunk/addonfactory-ucc-generator/issues/1916)) ([1dab3ae](https://github.com/splunk/addonfactory-ucc-generator/commit/1dab3ae00d9e5f79517db949026dda5c67ccdd4c)), closes [#1913](https://github.com/splunk/addonfactory-ucc-generator/issues/1913)
+* **date:** date picker as a new component ([#1857](https://github.com/splunk/addonfactory-ucc-generator/issues/1857)) ([e6a8be2](https://github.com/splunk/addonfactory-ucc-generator/commit/e6a8be2da7bc09fc9118e21943925dc59a9b72c9))
+* provide support for python.required ([#1932](https://github.com/splunk/addonfactory-ucc-generator/issues/1932)) ([16bd281](https://github.com/splunk/addonfactory-ucc-generator/commit/16bd2812cd836715790b01f797437edf83259bd5))
+* support custom favicons ([#1864](https://github.com/splunk/addonfactory-ucc-generator/issues/1864)) ([dd6e7f9](https://github.com/splunk/addonfactory-ucc-generator/commit/dd6e7f95b5544d8ebe774fc25686352f8859ed37))
+
 ## [6.0.1](https://github.com/splunk/addonfactory-ucc-generator/compare/v6.0.0...v6.0.1) (2025-09-30)
 
 

docs/CHANGELOG.md

@@ -16,7 +16,7 @@
 
 [tool.poetry]
 name = "splunk_add_on_ucc_framework"
-version = "6.0.1"
+version = "6.1.0"
 description = "Splunk Add-on SDK formerly UCC is a build and code generation framework"
 license = "Apache-2.0"
 authors = ["Splunk <[email protected]>"]
@@ -68,7 +68,7 @@ validate = ["splunk-appinspect"]
 mkdocs = "^1.6.1"
 pytest = "^7.2.1"
 pytest-splunk-addon = "^6.0.0"
-pytest-splunk-addon-ui-smartx = "5.4.0"
+pytest-splunk-addon-ui-smartx = "5.4.1"
 pytest-rerunfailures = "^11.1.1"
 mkdocs-material = "^9.6.16"
 mkdocstrings = {version=">=0", extras=["python"]}

poetry.lock

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "6.0.1"
+__version__ = "6.1.0"
 
 import logging
 

pyproject.toml

@@ -6,7 +6,7 @@
     "url": "git+https://github.com/splunk/addonfactory-ucc-generator.git",
     "directory": "ui"
   },
-  "version": "6.0.1",
+  "version": "6.1.0",
   "license": "Apache-2.0",
   "author": "Splunk Inc.",
   "homepage": "https://splunk.github.io/addonfactory-ucc-generator",

splunk_add_on_ucc_framework/__init__.py

@@ -6,6 +6,7 @@ import { z } from 'zod';
 
 import { setUnifiedConfig } from '../../util/util';
 import {
+    editOnlyModificationField,
     firstModificationField,
     firstStandardTextField,
     getConfigWithModifications,
@@ -15,9 +16,10 @@ import {
     thirdModificationField,
 } from './TestConfig';
 import EntityModal, { EntityModalProps } from '../EntityModal/EntityModal';
-import { EntitiesAllowingModifications } from '../../types/components/BaseFormTypes';
+import { BaseFormState, EntitiesAllowingModifications } from '../../types/components/BaseFormTypes';
 import { invariant } from '../../util/invariant';
 import { StringOrTextWithLinks } from '../../types/globalConfig/baseSchemas';
+import { getModificationForEntity } from './FormModifications';
 
 const handleRequestClose = vi.fn();
 const setUpConfigWithDefaultValue = () => {
@@ -286,3 +288,36 @@ it('verify no modifications', async () => {
 
     verifyAllProps(componentParentElement, componentInput, firstStandardTextField);
 });
+
+it('check mode for getModificationForEntity', () => {
+    const state: BaseFormState = {
+        data: {
+            [editOnlyModificationField.field]: {
+                value: 'a',
+                disabled: false,
+                error: false,
+                display: true,
+            },
+        },
+    };
+
+    const modificationEdit = getModificationForEntity(
+        editOnlyModificationField,
+        state,
+        'edit',
+        'configuration'
+    );
+    expect(modificationEdit).toBeDefined();
+    expect(modificationEdit?.fieldValue).toBe('a');
+    expect(modificationEdit?.fieldsToModify).toHaveLength(1);
+    expect(modificationEdit?.fieldsToModify[0].fieldId).toBe(firstStandardTextField.field);
+
+    // create mode should not return modification, when only edit mode is specified
+    const modificationCreate = getModificationForEntity(
+        editOnlyModificationField,
+        state,
+        'create',
+        'configuration'
+    );
+    expect(modificationCreate).toBeUndefined();
+});

ui/package.json

@@ -100,7 +100,7 @@ const ifRegexpMatchesValue = (
     }
 };
 
-const getModificationForEntity = (
+export const getModificationForEntity = (
     entity: EntitiesAllowingModifications,
     stateShallowCopy: BaseFormState,
     mode: Mode,
@@ -118,8 +118,8 @@ const getModificationForEntity = (
                 getValueMapTruthyFalse(currentFieldValue, page) ===
                     getValueMapTruthyFalse(mod.fieldValue, page) ||
                 // or if the mod value is a regex pattern and it matches the current field value
-                (ifRegexpMatchesValue(currentFieldValue, mod.fieldValue) &&
-                    (!mod.mode || mod.mode === mode)))
+                ifRegexpMatchesValue(currentFieldValue, mod.fieldValue)) &&
+            (!mod.mode || mod.mode === mode)
         );
     });
 

ui/src/components/FormModifications/FormModifications.test.tsx

@@ -145,6 +145,25 @@ export const thirdModificationField = {
     help: 'Third Modification field - checkbox - help',
 } satisfies z.infer<typeof CheckboxEntitySchema>;
 
+export const editOnlyModificationField = {
+    type: 'text',
+    label: 'Edit Only Modification field - text - label',
+    field: 'edit_only_modification_field',
+    help: 'Edit Only Modification field - text - help',
+    modifyFieldsOnValue: [
+        {
+            fieldValue: 'a',
+            mode: 'edit',
+            fieldsToModify: [
+                {
+                    fieldId: 'standard_text1',
+                    disabled: true,
+                },
+            ],
+        },
+    ],
+} satisfies z.infer<typeof TextEntitySchema>;
+
 export const regexpModificationField = {
     type: 'text',
     label: 'Regexp Modification field - text - label',