From 3c4591ef150e33f890e28e0b5a29f8bd4c41629d Mon Sep 17 00:00:00 2001
From: "Michael S. Molina" <70410625+michael-s-molina@users.noreply.github.com>
Date: Tue, 30 Mar 2021 17:55:10 -0300
Subject: [PATCH] chore: Moves CheckboxIcons to Checkbox folder (#13459)

---
 .../src/components/Checkbox/Checkbox.test.tsx |  6 ++-
 .../src/components/Checkbox/Checkbox.tsx      | 51 +++++++++++++++++++
 .../{ => Checkbox}/CheckboxIcons.tsx          |  0
 .../src/components/Checkbox/index.tsx         | 38 +-------------
 .../components/filterscope/treeIcons.jsx      |  2 +-
 5 files changed, 58 insertions(+), 39 deletions(-)
 create mode 100644 superset-frontend/src/components/Checkbox/Checkbox.tsx
 rename superset-frontend/src/components/{ => Checkbox}/CheckboxIcons.tsx (100%)

diff --git a/superset-frontend/src/components/Checkbox/Checkbox.test.tsx b/superset-frontend/src/components/Checkbox/Checkbox.test.tsx
index 5e493d3c44..f02aef486e 100644
--- a/superset-frontend/src/components/Checkbox/Checkbox.test.tsx
+++ b/superset-frontend/src/components/Checkbox/Checkbox.test.tsx
@@ -24,8 +24,10 @@ import {
   styledShallow as shallow,
 } from 'spec/helpers/theming';
 
-import Checkbox from '.';
-import { CheckboxChecked, CheckboxUnchecked } from '../CheckboxIcons';
+import Checkbox, {
+  CheckboxChecked,
+  CheckboxUnchecked,
+} from 'src/components/Checkbox';
 
 describe('Checkbox', () => {
   let wrapper: ReactWrapper;
diff --git a/superset-frontend/src/components/Checkbox/Checkbox.tsx b/superset-frontend/src/components/Checkbox/Checkbox.tsx
new file mode 100644
index 0000000000..8a7f7e06d3
--- /dev/null
+++ b/superset-frontend/src/components/Checkbox/Checkbox.tsx
@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import React from 'react';
+import { styled } from '@superset-ui/core';
+import { CheckboxChecked, CheckboxUnchecked } from 'src/components/Checkbox';
+
+interface CheckboxProps {
+  checked: boolean;
+  onChange: (val?: boolean) => void;
+  style?: React.CSSProperties;
+}
+
+const Styles = styled.span`
+  &,
+  & svg {
+    vertical-align: top;
+  }
+`;
+
+export default function Checkbox({ checked, onChange, style }: CheckboxProps) {
+  return (
+    <Styles
+      style={style}
+      onClick={() => {
+        onChange(!checked);
+      }}
+      role="checkbox"
+      tabIndex={0}
+      aria-checked={checked}
+      aria-label="Checkbox"
+    >
+      {checked ? <CheckboxChecked /> : <CheckboxUnchecked />}
+    </Styles>
+  );
+}
diff --git a/superset-frontend/src/components/CheckboxIcons.tsx b/superset-frontend/src/components/Checkbox/CheckboxIcons.tsx
similarity index 100%
rename from superset-frontend/src/components/CheckboxIcons.tsx
rename to superset-frontend/src/components/Checkbox/CheckboxIcons.tsx
diff --git a/superset-frontend/src/components/Checkbox/index.tsx b/superset-frontend/src/components/Checkbox/index.tsx
index 3ff55ad7a3..930c37c11c 100644
--- a/superset-frontend/src/components/Checkbox/index.tsx
+++ b/superset-frontend/src/components/Checkbox/index.tsx
@@ -16,39 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React from 'react';
-import { styled } from '@superset-ui/core';
-import {
-  CheckboxChecked,
-  CheckboxUnchecked,
-} from 'src/components/CheckboxIcons';
-
-interface CheckboxProps {
-  checked: boolean;
-  onChange: (val?: boolean) => void;
-  style?: React.CSSProperties;
-}
-
-const Styles = styled.span`
-  &,
-  & svg {
-    vertical-align: top;
-  }
-`;
-
-export default function Checkbox({ checked, onChange, style }: CheckboxProps) {
-  return (
-    <Styles
-      style={style}
-      onClick={() => {
-        onChange(!checked);
-      }}
-      role="checkbox"
-      tabIndex={0}
-      aria-checked={checked}
-      aria-label="Checkbox"
-    >
-      {checked ? <CheckboxChecked /> : <CheckboxUnchecked />}
-    </Styles>
-  );
-}
+export { default } from 'src/components/Checkbox/Checkbox';
+export * from 'src/components/Checkbox/CheckboxIcons';
diff --git a/superset-frontend/src/dashboard/components/filterscope/treeIcons.jsx b/superset-frontend/src/dashboard/components/filterscope/treeIcons.jsx
index b7730f21d0..dd8e0dd1c1 100644
--- a/superset-frontend/src/dashboard/components/filterscope/treeIcons.jsx
+++ b/superset-frontend/src/dashboard/components/filterscope/treeIcons.jsx
@@ -24,7 +24,7 @@ import {
   CheckboxChecked,
   CheckboxUnchecked,
   CheckboxHalfChecked,
-} from '../../../components/CheckboxIcons';
+} from 'src/components/Checkbox/CheckboxIcons';
 
 const treeIcons = {
   check: <CheckboxChecked />,