chore: merge develop into main (#1284)

splunk · Jul 11, 2024 · 8e02684 · 8e02684
2 parents 07910c6 + 571bef7
commit 8e02684
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 15 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -15,7 +15,7 @@
 * **select entity:** allow custom mapping for values ([#1265](https://github.com/splunk/addonfactory-ucc-generator/issues/1265)) ([202f046](https://github.com/splunk/addonfactory-ucc-generator/commit/202f046c662427b7123825d42b5baecba9355071))
 
 
-[5.47.0](https://github.com/splunk/addonfactory-ucc-generator/compare/v5.46.0...v5.47.0) (2024-06-25)
+# [5.47.0](https://github.com/splunk/addonfactory-ucc-generator/compare/v5.46.0...v5.47.0) (2024-06-25)
 
 
 ### Bug Fixes

diff --git a/splunk_add_on_ucc_framework/schema/schema.json b/splunk_add_on_ucc_framework/schema/schema.json
@@ -785,6 +785,10 @@
               "type": "string",
               "description": "If you use endpointUrl and your data are not simple text data, you can specify here which property of retrieved object should be used.```item.content?.[labelField]``` "
             },
+            "valueField": {
+              "type": "string",
+              "description": "If you use endpointUrl and your data are not simple text data, you can specify here which property of retrieved object should be used as value for each item.```item.content?.[valueField]```"
+            },
             "autoCompleteFields": {
               "$ref": "#/definitions/AutoCompleteFields"
             },
@@ -914,6 +918,10 @@
               "type": "string",
               "description": "If you use endpointUrl and your data are not simple text data, you can specify here which property of retrieved object should be used.```item.content?.[labelField]``` "
             },
+            "valueField": {
+              "type": "string",
+              "description": "If you use endpointUrl and your data are not simple text data, you can specify here which property of retrieved object should be used as value for each item.```item.content?.[valueField]```"
+            },
             "autoCompleteFields": {
               "$ref": "#/definitions/AutoCompleteFields"
             },

diff --git a/ui/.storybook/withSplunkTheme.tsx b/ui/.storybook/withSplunkTheme.tsx
@@ -4,9 +4,8 @@ import { AnimationToggleProvider } from '@splunk/react-ui/AnimationToggle';
 import { SplunkThemeProvider } from '@splunk/themes';
 import { BrowserRouter as Router } from 'react-router-dom';
 import React, { Suspense } from 'react';
-import { StyledContainer } from '../src/pages/EntryPageStyle';
+import { GlobalBodyStyle, StyledContainer } from '../src/pages/EntryPageStyle';
 import { WaitSpinnerWrapper } from '../src/components/table/CustomTableStyle';
-import { GlobalStyle } from '../src/pages/entry_page';
 import fontDefinitions from './fontDefinitions';
 
 const TestStylesForConsistentScreenshots = createGlobalStyle`
@@ -34,7 +33,7 @@ export const withSplunkThemeToolbar = <TRenderer extends Renderer>(
         <AnimationToggleProvider enabled={animation}>
             <TestStylesForConsistentScreenshots />
             <SplunkThemeProvider family={family} density={density} colorScheme={colorScheme}>
-                <GlobalStyle />
+                <GlobalBodyStyle />
                 <StyledContainer>
                     <Router>
                         <Suspense fallback={<WaitSpinnerWrapper size="medium" />}>

diff --git a/ui/src/pages/EntryPageStyle.js b/ui/src/pages/EntryPageStyle.js
@@ -1,4 +1,4 @@
-import styled from 'styled-components';
+import styled, { createGlobalStyle } from 'styled-components';
 import { variables, mixins } from '@splunk/themes';
 import Button from '@splunk/react-ui/Button';
 
@@ -20,4 +20,10 @@ const StyledButton = styled(Button)`
     min-width: 80px;
 `;
 
+export const GlobalBodyStyle = createGlobalStyle`
+    body {
+        background-color: ${variables.backgroundColorPage};
+    }
+`;
+
 export { StyledContainer, StyledGreeting, StyledButton };
diff --git a/ui/src/pages/entry_page.jsx b/ui/src/pages/entry_page.jsx
@@ -3,11 +3,9 @@ import layout from '@splunk/react-page';
 import { BrowserRouter as Router } from 'react-router-dom';
 import { SplunkThemeProvider } from '@splunk/themes';
 import { getUserTheme } from '@splunk/splunk-utils/themes';
-import { createGlobalStyle } from 'styled-components';
-import colors from '@splunk/themes/variables';
 import { WaitSpinnerWrapper } from '../components/table/CustomTableStyle';
 
-import { StyledContainer } from './EntryPageStyle';
+import { GlobalBodyStyle, StyledContainer } from './EntryPageStyle';
 import { PAGE_CONF, PAGE_DASHBOARD, PAGE_INPUT } from '../constants/pages';
 import ConfigManager from '../util/configManager';
 import messageDict from '../constants/messageDict';
@@ -25,12 +23,6 @@ const DashboardPage = React.lazy(() =>
     import(/* webpackPrefetch: true */ './Dashboard/DashboardPage')
 );
 
-export const GlobalStyle = createGlobalStyle`
-    body {
-        background-color: ${colors.backgroundColorPage};
-    }
-`;
-
 // Take in a component as argument WrappedComponent
 function higherOrderComponent(WrappedComponent) {
     // And return another component
@@ -39,7 +31,7 @@ function higherOrderComponent(WrappedComponent) {
         render() {
             return (
                 <SplunkThemeProvider>
-                    <GlobalStyle />
+                    <GlobalBodyStyle />
                     <StyledContainer>
                         <Router>
                             <ConfigManager>