diff --git a/src/components/MainView/DataViewOld/Table.js b/src/components/MainView/DataView/Table.js similarity index 100% rename from src/components/MainView/DataViewOld/Table.js rename to src/components/MainView/DataView/Table.js diff --git a/src/components/MainView/DataViewOld/Table.styl b/src/components/MainView/DataView/Table.styl similarity index 100% rename from src/components/MainView/DataViewOld/Table.styl rename to src/components/MainView/DataView/Table.styl diff --git a/src/components/MainView/GridViewOld/GridView.js b/src/components/MainView/GridView/GridView.js similarity index 100% rename from src/components/MainView/GridViewOld/GridView.js rename to src/components/MainView/GridView/GridView.js diff --git a/src/components/MainView/GridViewOld/GridView.styl b/src/components/MainView/GridView/GridView.styl similarity index 100% rename from src/components/MainView/GridViewOld/GridView.styl rename to src/components/MainView/GridView/GridView.styl diff --git a/src/components/MainView/index.js b/src/components/MainView/index.js deleted file mode 100644 index d5638451..00000000 --- a/src/components/MainView/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import { DataView as DataViewOld } from "./DataViewOld/Table"; - -export const DataView = DataViewOld; diff --git a/src/mixins/DataStore/DataStore.js b/src/mixins/DataStore/DataStore.js index 58b11d86..e5b6b1ad 100644 --- a/src/mixins/DataStore/DataStore.js +++ b/src/mixins/DataStore/DataStore.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) diff --git a/src/stores/Tabs/tab.js b/src/stores/Tabs/tab.js index 2b29f45f..55ecbca6 100644 --- a/src/stores/Tabs/tab.js +++ b/src/stores/Tabs/tab.js @@ -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) { diff --git a/src/utils/feature-flags.js b/src/utils/feature-flags.js index a1185f59..8d9314eb 100644 --- a/src/utils/feature-flags.js +++ b/src/utils/feature-flags.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