fix: revert "feat: ADDON-61556 Introduced checkbox group component (#394

)" (#428) This reverts commit 9ffed80.
splunk · Sep 13, 2023 · 358b1be · 358b1be
1 parent 10d1031
commit 358b1be
Show file tree

Hide file tree

Showing 7 changed files with 166 additions and 587 deletions.
diff --git a/ui/src/main/webapp/components/BaseFormView.jsx b/ui/src/main/webapp/components/BaseFormView.jsx
diff --git a/ui/src/main/webapp/components/CheckboxGroupsComponent.jsx b/ui/src/main/webapp/components/CheckboxGroupsComponent.jsx
diff --git a/ui/src/main/webapp/components/ControlWrapper.jsx b/ui/src/main/webapp/components/ControlWrapper.jsx
@@ -1,11 +1,35 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import ControlGroup from '@splunk/react-ui/ControlGroup';
+import styled from 'styled-components';
 
 import MarkdownMessage from './MarkdownMessage';
 import CONTROL_TYPE_MAP from '../constants/ControlTypeMap';
-import { CustomElement, CheckboxElement, ControlGroupWrapper } from './StyledComponent';
 
-const CHECKBOX_GROUPS = 'checkboxGroups';
+const CustomElement = styled.div`
+    margin-left: 30px;
+`;
+
+const ControlGroupWrapper = styled(ControlGroup).attrs((props) => ({
+    'data-name': props.dataName,
+}))`
+    width: 100%;
+    max-width: 100%;
+
+    > * {
+        &:first-child {
+            width: 240px !important;
+        }
+        &:nth-child(3) {
+            margin-left: 270px !important;
+            width: 320px;
+        }
+    }
+
+    span[class*='ControlGroupStyles__StyledAsterisk-'] {
+        color: red;
+    }
+`;
 
 class ControlWrapper extends React.PureComponent {
     static isString = (str) => !!(typeof str === 'string' || str instanceof String);
@@ -54,9 +78,7 @@ class ControlWrapper extends React.PureComponent {
             rowView = this.controlType
                 ? React.createElement(this.controlType, {
                       handleChange,
-                      label: this.props.entity.label,
                       value: this.props.value,
-                      checkboxTextFieldValue: this.props.checkboxTextFieldValue,
                       field,
                       controlOptions: this.props.entity.options,
                       error: this.props.error,
@@ -83,10 +105,7 @@ class ControlWrapper extends React.PureComponent {
         );
 
         return (
-            this.props.display &&
-            (this.props.entity.type === CHECKBOX_GROUPS ? (
-                <CheckboxElement>{rowView}</CheckboxElement>
-            ) : (
+            this.props.display && (
                 <ControlGroupWrapper
                     label={label}
                     help={helpText}
@@ -97,7 +116,7 @@ class ControlWrapper extends React.PureComponent {
                 >
                     <CustomElement>{rowView}</CustomElement>
                 </ControlGroupWrapper>
-            ))
+            )
         );
     }
 }
@@ -106,7 +125,6 @@ ControlWrapper.propTypes = {
     mode: PropTypes.string,
     utilityFuncts: PropTypes.object,
     value: PropTypes.any,
-    checkboxTextFieldValue: PropTypes.any,
     display: PropTypes.bool,
     error: PropTypes.bool,
     entity: PropTypes.object,

diff --git a/ui/src/main/webapp/components/StyledComponent.jsx b/ui/src/main/webapp/components/StyledComponent.jsx
diff --git a/ui/src/main/webapp/constants/ControlTypeMap.ts b/ui/src/main/webapp/constants/ControlTypeMap.ts
@@ -8,7 +8,6 @@ import RadioComponent from '../components/RadioComponent';
 import PlaceholderComponent from '../components/PlaceholderComponent';
 import CustomControl from '../components/CustomControl';
 import FileInputComponent from '../components/FileInputComponent';
-import CheckboxGroupsComponent from '../components/CheckboxGroupsComponent';
 
 export default {
     text: TextComponent,
@@ -20,6 +19,5 @@ export default {
     radio: RadioComponent,
     file: FileInputComponent,
     placeholder: PlaceholderComponent,
-    checkboxGroups: CheckboxGroupsComponent,
     custom: CustomControl,
 };