update block page with blockversion changes (#12261)

Author: eviljeff

src/amo/pages/Block/index.js

@@ -115,13 +115,14 @@ export class BlockBase extends React.Component<InternalProps> {
       return <LoadingText />;
     }
 
-    if (block.min_version === '0' && block.max_version === '*') {
+    if (block.is_all_versions) {
       return i18n.gettext('Versions blocked: all versions.');
     }
 
-    return i18n.sprintf(i18n.gettext('Versions blocked: %(min)s to %(max)s.'), {
-      min: block.min_version,
-      max: block.max_version,
+    const versions = block.versions.join(', ');
+
+    return i18n.sprintf(i18n.gettext('Versions blocked: %(versions)s.'), {
+      versions,
     });
   }
 

src/amo/reducers/blocks.js

@@ -14,8 +14,8 @@ export type ExternalBlockType = {|
   created: string,
   guid: string,
   id: number,
-  max_version: string,
-  min_version: string,
+  versions: [string],
+  is_all_versions?: boolean,
   modified: string,
   reason: string | null,
   url: UrlWithOutgoing | null,

tests/unit/amo/pages/TestBlock.js

@@ -185,10 +185,9 @@ describe(__filename, () => {
     expect(screen.queryByClassName('Block-reason')).not.toBeInTheDocument();
   });
 
-  it('renders "all versions" when min is 0 and max is *', () => {
+  it('renders "all versions" when "is_all_versions" is true', () => {
     const block = _createFakeBlockResult({
-      min_version: '0',
-      max_version: '*',
+      is_all_versions: true,
     });
     const i18n = fakeI18n();
     store.dispatch(loadBlock({ block }));
@@ -205,12 +204,12 @@ describe(__filename, () => {
     ).toBeInTheDocument();
   });
 
-  it('renders the min/max versions if min is not 0 and max is not *', () => {
-    const min = '12';
-    const max = '34';
+  it('renders the versions if "is_all_versions" is false', () => {
+    const v1 = '12';
+    const v2 = '34';
     const block = _createFakeBlockResult({
-      min_version: min,
-      max_version: max,
+      versions: [v1, v2],
+      is_all_versions: false,
     });
     const i18n = fakeI18n();
     store.dispatch(loadBlock({ block }));
@@ -220,7 +219,29 @@ describe(__filename, () => {
     // by a </br>.
     expect(
       screen.getByTextAcrossTags(
-        `Versions blocked: ${min} to ${max}.Blocked on ${i18n
+        `Versions blocked: ${v1}, ${v2}.Blocked on ${i18n
+          .moment(block.created)
+          .format('ll')}.`,
+      ),
+    ).toBeInTheDocument();
+  });
+
+  it('renders the versions if "is_all_versions" is missing', () => {
+    const v1 = '12';
+    const v2 = '34';
+    const block = _createFakeBlockResult({
+      versions: [v1, v2],
+      is_all_versions: undefined,
+    });
+    const i18n = fakeI18n();
+    store.dispatch(loadBlock({ block }));
+    render();
+
+    // The version info and the block date are inside the same tag, separated
+    // by a </br>.
+    expect(
+      screen.getByTextAcrossTags(
+        `Versions blocked: ${v1}, ${v2}.Blocked on ${i18n
           .moment(block.created)
           .format('ll')}.`,
       ),

tests/unit/helpers.js

@@ -1292,8 +1292,8 @@ export const createFakeBlockResult = ({
     created: '2020-01-22T10:09:01Z',
     modified: '2020-01-22T10:09:01Z',
     guid,
-    min_version: '0',
-    max_version: '*',
+    versions: ['0.1', '4.56'],
+    is_all_versions: false,
     addon_name: addonName,
     reason,
     url,