Revert "Fix changing column order/visibility via sidebar is inconsistent #13455 (#21338)" (#22342)

This reverts commit 605a726a.

frontend/src/metabase/query_builder/selectors.js

@@ -330,7 +330,6 @@ export function normalizeQuery(query, tableMetadata) {
     return query;
   }
   if (query.query) {
-    // sort query.fields
     if (tableMetadata) {
       query = updateIn(query, ["query", "fields"], fields => {
         fields = fields
@@ -343,23 +342,6 @@ export function normalizeQuery(query, tableMetadata) {
         );
       });
     }
-
-    // sort query.joins[int].fields
-    if (query.query.joins) {
-      query = updateIn(query, ["query", "joins"], joins =>
-        joins.map(joinedTable => {
-          if (!joinedTable.fields || joinedTable.fields === "all") {
-            return joinedTable;
-          }
-
-          const joinedTableFields = [...joinedTable.fields];
-          joinedTableFields.sort((a, b) =>
-            JSON.stringify(b).localeCompare(JSON.stringify(a)),
-          );
-          return { ...joinedTable, fields: joinedTableFields };
-        }),
-      );
-    }
     ["aggregation", "breakout", "filter", "joins", "order-by"].forEach(
       clauseList => {
         if (query.query[clauseList]) {

frontend/src/metabase/visualizations/components/settings/ChartSettingOrderedColumns.jsx

@@ -59,11 +59,9 @@ export default class ChartSettingOrderedColumns extends Component {
   };
 
   handleSortEnd = ({ oldIndex, newIndex }) => {
-    const enabledColumns = [...this.props.value].filter(columnSetting =>
-      findColumnForColumnSetting(this.props.columns, columnSetting),
-    );
-    enabledColumns.splice(newIndex, 0, enabledColumns.splice(oldIndex, 1)[0]);
-    this.props.onChange(enabledColumns);
+    const fields = [...this.props.value];
+    fields.splice(newIndex, 0, fields.splice(oldIndex, 1)[0]);
+    this.props.onChange(fields);
   };
 
   handleEdit = columnSetting => {

frontend/src/metabase/visualizations/visualizations/Table.jsx

@@ -173,9 +173,7 @@ export default class Table extends Component {
         // otherwise it will be overwritten by `getDefault` below
         card.visualization_settings["table.columns"].length !== 0 &&
         _.all(
-          card.visualization_settings["table.columns"].filter(
-            columnSetting => columnSetting.enabled,
-          ),
+          card.visualization_settings["table.columns"],
           columnSetting =>
             findColumnIndexForColumnSetting(data.cols, columnSetting) >= 0,
         ),

frontend/test/metabase/scenarios/question/settings.cy.spec.js

@@ -72,7 +72,7 @@ describe("scenarios > question > settings", () => {
         .should("not.exist");
     });
 
-    it("should preserve correct order of columns after column removal or addition via sidebar (metabase#13455)", () => {
+    it.skip("should preserve correct order of columns after column removal via sidebar (metabase#13455)", () => {
       cy.viewport(2000, 1200);
       // Orders join Products
       visitQuestionAdhoc({
@@ -173,10 +173,6 @@ describe("scenarios > question > settings", () => {
         cy.icon("play")
           .last()
           .click();
-
-        // Prevent performing actions while the query is being executed.
-        // Which caused some race condition and failed the test.
-        cy.wait("@dataset");
       }
 
       function findColumnAtIndex(column_name, index) {