Hide ADU for new add-ons (#13962)

Author: willdurand

config/default.js

@@ -110,6 +110,7 @@ module.exports = {
     'langs',
     'loggingLevel',
     'mozillaUserId',
+    'recentAddonCutOffDays',
     'rtlLangs',
     'staticPath',
     'trackingEnabled',
@@ -408,6 +409,8 @@ module.exports = {
 
   extensionWorkshopUrl: 'https://extensionworkshop.com',
 
+  recentAddonCutOffDays: 30,
+
   // The withExperiment HOC relies on this config to enable/disable A/B
   // experiments on AMO.
   experiments: {

src/amo/components/AddonBadges/index.js

@@ -19,6 +19,7 @@ import './styles.scss';
 
 type Props = {|
   addon: AddonType,
+  hideUsers?: boolean,
 |};
 
 type DefaultProps = {|
@@ -49,8 +50,9 @@ export class AddonBadgesBase extends React.Component<InternalProps> {
   renderAndroidCompatibleBadge(): React.Node {
     const { addon, clientApp, i18n } = this.props;
 
-    if (clientApp !== CLIENT_APP_FIREFOX || !addon.isAndroidCompatible)
+    if (clientApp !== CLIENT_APP_FIREFOX || !addon.isAndroidCompatible) {
       return null;
+    }
 
     return (
       <Badge
@@ -64,7 +66,9 @@ export class AddonBadgesBase extends React.Component<InternalProps> {
   renderExperimentalBadge(): React.Node {
     const { addon, i18n } = this.props;
 
-    if (!addon.is_experimental) return null;
+    if (!addon.is_experimental) {
+      return null;
+    }
 
     return (
       <Badge
@@ -78,7 +82,9 @@ export class AddonBadgesBase extends React.Component<InternalProps> {
   renderRequiresPaymentBadge(): React.Node {
     const { addon, i18n } = this.props;
 
-    if (!addon.requires_payment) return null;
+    if (!addon.requires_payment) {
+      return null;
+    }
 
     return (
       <Badge
@@ -98,7 +104,9 @@ export class AddonBadgesBase extends React.Component<InternalProps> {
       forBadging: true,
     });
 
-    if (!promotedCategory) return null;
+    if (!promotedCategory) {
+      return null;
+    }
 
     const props = getPromotedProps(i18n, promotedCategory);
 
@@ -116,7 +124,9 @@ export class AddonBadgesBase extends React.Component<InternalProps> {
   renderRatingMeta(): React.Node {
     const { addon, i18n, location } = this.props;
 
-    if (!addon?.ratings) return null;
+    if (!addon?.ratings) {
+      return null;
+    }
 
     const addonRatingCount: number = addon.ratings.count;
     const averageRating: number = addon.ratings.average;
@@ -145,9 +155,11 @@ export class AddonBadgesBase extends React.Component<InternalProps> {
   }
 
   renderUserCount(): React.Node {
-    const { addon, i18n } = this.props;
+    const { addon, hideUsers, i18n } = this.props;
 
-    if (!addon) return null;
+    if (!addon || hideUsers) {
+      return null;
+    }
 
     const averageDailyUsers = addon.average_daily_users;
 

src/amo/components/SearchResult/index.js

@@ -15,6 +15,7 @@ import {
 } from 'amo/constants';
 import translate from 'amo/i18n/translate';
 import { getAddonIconUrl, getPreviewImage } from 'amo/imageUtils';
+import { isRecentAddon } from 'amo/reducers/addons';
 import { getPromotedCategory } from 'amo/utils/addons';
 import { addQueryParams } from 'amo/utils/url';
 import Icon from 'amo/components/Icon';
@@ -248,23 +249,26 @@ export class SearchResultBase extends React.Component<InternalProps> {
             )}
           </div>
 
-          <h3 className="SearchResult-users SearchResult--meta-section">
-            <Icon className="SearchResult-users-icon" name="user-fill" />
-            <span className="SearchResult-users-text">
-              {averageDailyUsers !== null && averageDailyUsers !== undefined ? (
-                i18n.sprintf(
-                  i18n.ngettext(
-                    '%(total)s user',
-                    '%(total)s users',
-                    averageDailyUsers,
-                  ),
-                  { total: i18n.formatNumber(averageDailyUsers) },
-                )
-              ) : (
-                <LoadingText width={80} />
-              )}
-            </span>
-          </h3>
+          {!isRecentAddon(addon) && (
+            <h3 className="SearchResult-users SearchResult--meta-section">
+              <Icon className="SearchResult-users-icon" name="user-fill" />
+              <span className="SearchResult-users-text">
+                {averageDailyUsers !== null &&
+                averageDailyUsers !== undefined ? (
+                  i18n.sprintf(
+                    i18n.ngettext(
+                      '%(total)s user',
+                      '%(total)s users',
+                      averageDailyUsers,
+                    ),
+                    { total: i18n.formatNumber(averageDailyUsers) },
+                  )
+                ) : (
+                  <LoadingText width={80} />
+                )}
+              </span>
+            </h3>
+          )}
         </div>
       </div>
     );

src/amo/pages/Addon/index.js

@@ -36,6 +36,7 @@ import {
   fetchAddon,
   getAddonByIdInURL,
   isAddonLoading,
+  isRecentAddon,
 } from 'amo/reducers/addons';
 import { sendServerRedirect } from 'amo/reducers/redirectTo';
 import { withFixedErrorHandler } from 'amo/errorHandler';
@@ -70,6 +71,7 @@ export class AddonBase extends React.Component {
     currentVersion: PropTypes.object,
     dispatch: PropTypes.func.isRequired,
     errorHandler: PropTypes.object.isRequired,
+    hideMetadata: PropTypes.bool.isRequired,
     i18n: PropTypes.object.isRequired,
     installError: PropTypes.string,
     lang: PropTypes.string.isRequired,
@@ -372,6 +374,7 @@ export class AddonBase extends React.Component {
       clientApp,
       currentVersion,
       errorHandler,
+      hideMetadata,
       i18n,
     } = this.props;
 
@@ -451,7 +454,7 @@ export class AddonBase extends React.Component {
                 {showSummary ? summary : null}
               </div>
 
-              <AddonBadges addon={addon} />
+              <AddonBadges addon={addon} hideUsers={hideMetadata} />
 
               <div className="Addon-install">
                 <InstallButtonWrapper addon={addon} />
@@ -528,6 +531,7 @@ function mapStateToProps(state, ownProps) {
     addonsByAuthors,
     clientApp: state.api.clientApp,
     currentVersion,
+    hideMetadata: isRecentAddon(addon),
     installError: installedAddon.error,
     lang: state.api.lang,
     // The `withInstallHelpers` HOC requires an `addon` prop too:

src/amo/reducers/addons.js

@@ -1,5 +1,6 @@
 /* @flow */
 import invariant from 'invariant';
+import config from 'config';
 
 import { CLIENT_APP_ANDROID, ADDON_TYPE_EXTENSION } from 'amo/constants';
 import {
@@ -20,6 +21,7 @@ import type { ExternalAddonInfoType } from 'amo/api/addonInfo';
 import type { AppState } from 'amo/store';
 import type {
   AddonType,
+  CollectionAddonType,
   ExternalAddonType,
   ExternalPreviewType,
   GroupedRatingsType,
@@ -336,6 +338,20 @@ export const isAddonInfoLoading = ({
   return Boolean(infoForSlug && infoForSlug.loading);
 };
 
+export const isRecentAddon = (
+  addon: ?AddonType | CollectionAddonType | null,
+  { _config = config }: { _config: typeof config } = {},
+): boolean => {
+  if (!addon) {
+    return false;
+  }
+
+  const created = new Date(addon.created);
+  created.setDate(created.getDate() + _config.get('recentAddonCutOffDays'));
+
+  return created >= new Date();
+};
+
 export const createInternalAddonInfo = (
   addonInfo: ExternalAddonInfoType,
   lang: string,

tests/unit/amo/components/TestSearchResults.js

@@ -100,6 +100,7 @@ describe(__filename, () => {
       'src',
       headerImageFull,
     );
+    expect(screen.getByClassName('SearchResult-users')).toBeInTheDocument();
   });
 
   it('sets add-on install source to search by default', () => {
@@ -148,4 +149,19 @@ describe(__filename, () => {
 
     expect(screen.getByText('Page 1 of 2')).toBeInTheDocument();
   });
+
+  it('does not render the user count for recent add-ons', () => {
+    const results = [
+      createInternalAddonWithLang({ ...fakeAddon, created: new Date() }),
+    ];
+    render({
+      filters: { query: 'test' },
+      loading: false,
+      results,
+    });
+
+    expect(
+      screen.queryByClassName('SearchResult-users'),
+    ).not.toBeInTheDocument();
+  });
 });

tests/unit/amo/pages/TestAddon.js

@@ -1051,6 +1051,17 @@ describe(__filename, () => {
     expect(content).toHaveTextContent('No Users');
   });
 
+  it('does not render the user count badge when the add-on is too recent', () => {
+    addon = {
+      ...addon,
+      created: new Date(),
+    };
+    renderWithAddon();
+
+    const badge = screen.queryByTestId(`badge-user-fill`);
+    expect(badge).not.toBeInTheDocument();
+  });
+
   it('renders user count badge with singular user', () => {
     addon = {
       ...addon,

tests/unit/amo/reducers/test_addons.js

@@ -18,6 +18,7 @@ import addons, {
   initialState,
   isAddonInfoLoading,
   isAddonLoading,
+  isRecentAddon,
   loadAddon,
   loadAddonInfo,
   selectLocalizedUrlWithOutgoing,
@@ -26,14 +27,15 @@ import { setLang } from 'amo/reducers/api';
 import {
   DEFAULT_LANG_IN_TESTS,
   createFakeAddon,
+  createFakeAddonInfo,
   createInternalAddonWithLang,
   createLocalizedString,
   createStubErrorHandler,
   dispatchClientMetadata,
   fakeAddon,
   fakePreview,
-  createFakeAddonInfo,
   fakeReview,
+  getMockConfig,
 } from 'tests/unit/helpers';
 
 describe(__filename, () => {
@@ -1063,4 +1065,37 @@ describe(__filename, () => {
       ).toEqual(null);
     });
   });
+
+  describe('isRecentAddon', () => {
+    it('should return false when there is no add-on', () => {
+      expect(isRecentAddon(null)).toEqual(false);
+    });
+
+    it('should return true when the add-on is recent', () => {
+      // Cut-off is a day ago.
+      const _config = getMockConfig({ recentAddonCutOffDays: 1 });
+      _config.get = (key) => _config[key];
+
+      // Add-on was just created.
+      const created = new Date();
+
+      expect(isRecentAddon({ ...fakeAddon, created }, { _config })).toEqual(
+        true,
+      );
+    });
+
+    it('should return false when the add-on is no longer recent', () => {
+      // Cut-off is a day ago.
+      const _config = getMockConfig({ recentAddonCutOffDays: 1 });
+      _config.get = (key) => _config[key];
+
+      // Add-on created 2 days ago.
+      const created = new Date();
+      created.setDate(created.getDate() - 2);
+
+      expect(isRecentAddon({ ...fakeAddon, created }, { _config })).toEqual(
+        false,
+      );
+    });
+  });
 });