Fix display values options not updated after the field is updated (#21217)

frontend/src/metabase/entities/fields.js

@@ -88,11 +88,18 @@ const Fields = createEntity({
     }),
 
     updateField(field, opts) {
-      return Fields.actions.update(
-        { id: field.id },
-        field,
-        notify(opts, field.display_name, t`updated`),
-      );
+      return async dispatch => {
+        const result = await dispatch(
+          Fields.actions.update(
+            { id: field.id },
+            field,
+            notify(opts, field.display_name, t`updated`),
+          ),
+        );
+        // Field values needs to be fetched again once the field is updated metabase#16322
+        await dispatch(Fields.actions.fetchFieldValues(field));
+        return result;
+      };
     },
     // Docstring from m.api.field:
     // Update the human-readable values for a `Field` whose semantic type is

frontend/test/metabase/scenarios/admin/datamodel/metadata.cy.spec.js

@@ -128,7 +128,7 @@ describe("scenarios > admin > datamodel > metadata", () => {
       .should("have.length", 1);
   });
 
-  it.skip("display value 'custom mapping' should be available regardless of the chosen filtering type (metabase#16322)", () => {
+  it("display value 'custom mapping' should be available regardless of the chosen filtering type (metabase#16322)", () => {
     cy.visit(
       `/admin/datamodel/database/1/table/${REVIEWS_ID}/${REVIEWS.RATING}/general`,
     );
@@ -138,7 +138,15 @@ describe("scenarios > admin > datamodel > metadata", () => {
       .findByText("Search box")
       .click();
 
-    cy.reload();
+    openOptionsForSection("Display values");
+    popover()
+      .findByText("Custom mapping")
+      .should("not.exist");
+
+    openOptionsForSection("Filtering on this field");
+    popover()
+      .findByText("A list of all values")
+      .click();
 
     openOptionsForSection("Display values");
     popover().findByText("Custom mapping");