refactor: OPTIC-429: Step 2 to avoid complexity in reading the PR

Author: luarmr

src/components/DataManager/DataManager.js

@@ -8,7 +8,7 @@ import { Space } from "../Common/Space/Space";
 import { Spinner } from "../Common/Spinner";
 import { Tabs, TabsItem } from "../Common/Tabs/Tabs";
 import { FiltersSidebar } from "../Filters/FiltersSidebar/FilterSidebar";
-import { DataView } from "../MainView";
+import { DataView } from "../MainView/DataView/Table";
 import "./DataManager.styl";
 import { Toolbar } from "./Toolbar/Toolbar";
 

src/components/Label/Label.js

@@ -9,7 +9,7 @@ import { FieldsButton } from "../Common/FieldsButton";
 import { Icon } from "../Common/Icon/Icon";
 import { Resizer } from "../Common/Resizer/Resizer";
 import { Space } from "../Common/Space/Space";
-import { DataView } from "../MainView";
+import { DataView } from "../MainView/DataView/Table";
 import "./Label.styl";
 
 const LabelingHeader = ({ SDK, onClick, isExplorerMode }) => {

src/components/MainView/DataViewOld/Table.js renamed to src/components/MainView/DataView/Table.js

@@ -2,7 +2,7 @@ import { flow, getRoot, types } from "mobx-state-tree";
 import { guidGenerator } from "../../utils/random";
 import { isDefined } from "../../utils/utils";
 import { DEFAULT_PAGE_SIZE, getStoredPageSize } from "../../components/Common/Pagination/Pagination";
-import { FF_DEV_1470, FF_LOPS_E_3, isFF } from "../../utils/feature-flags";
+import { FF_LOPS_E_3, isFF } from "../../utils/feature-flags";
 
 const listIncludes = (list, id) => {
   const index =
@@ -197,7 +197,7 @@ export const DataStore = (
 
         self.loading = true;
 
-        if(interaction === "filter" || ((!isFF(FF_DEV_1470)) && interaction === "ordering") || ((!isFF(FF_DEV_1470)) && reload)) {
+        if(interaction === "filter" || interaction === "ordering" || reload) {
           self.page = 1;
         } else if (reload || isDefined(pageNumber)) {
           if (self.page === 0)

src/components/MainView/DataViewOld/Table.styl renamed to src/components/MainView/DataView/Table.styl

@@ -14,7 +14,7 @@ import { TabFilter } from "./tab_filter";
 import { TabHiddenColumns } from "./tab_hidden_columns";
 import { TabSelectedItems } from "./tab_selected_items";
 import { History } from '../../utils/history';
-import { FF_DEV_1470, FF_LOPS_12, isFF } from "../../utils/feature-flags";
+import { FF_LOPS_12, isFF } from "../../utils/feature-flags";
 import { CustomJSON, StringOrNumberID, ThresholdType } from "../types";
 import { clamp } from "../../utils/helpers";
 
@@ -253,7 +253,7 @@ export const Tab = types
     setType(type) {
       self.type = type;
       self.root.SDK.invoke("tabTypeChanged", { tab: self.id, type });
-      self.save({ reload: isFF(FF_DEV_1470) });
+      self.save({ reload: false });
     },
 
     setTarget(target) {

src/components/MainView/GridViewOld/GridView.js renamed to src/components/MainView/GridView/GridView.js

@@ -1,9 +1,6 @@
 // Outliner + Details
 export const FF_DEV_1170 = "ff_front_1170_outliner_030222_short";
 
-// Switch to page navigation
-export const FF_DEV_1470 = "ff_front_dev_1470_dm_pagination_010422_short";
-
 /**
  * Support for notification links in the Label Steam and the Review Stream.
  * @link https://app.launchdarkly.com/default/branch/features/feat_front_dev_1752_notification_links_in_label_and_review_streams