Merge branch '323326-follow-up-from-create-edit-compliance-framework-page' into 'master'

Move the isNumeric util to the shared number_utils.js

See merge request gitlab-org/gitlab!55833

app/assets/javascripts/lib/utils/number_utils.js

@@ -150,3 +150,24 @@ export const formattedChangeInPercent = (firstY, lastY, { nonFiniteResult = '-'
 
   return `${change >= 0 ? '+' : ''}${change}%`;
 };
+
+/**
+ * Checks whether a value is numerical in nature by converting it using parseInt
+ *
+ * Example outcomes:
+ *   - isNumeric(100) = true
+ *   - isNumeric('100') = true
+ *   - isNumeric(1.0) = true
+ *   - isNumeric('1.0') = true
+ *   - isNumeric('abc100') = false
+ *   - isNumeric('abc') = false
+ *   - isNumeric(true) = false
+ *   - isNumeric(undefined) = false
+ *   - isNumeric(null) = false
+ *
+ * @param value
+ * @returns {boolean}
+ */
+export const isNumeric = (value) => {
+  return !Number.isNaN(parseInt(value, 10));
+};

ee/app/assets/javascripts/audit_events/components/tokens/shared/audit_filter_token.vue

@@ -8,8 +8,8 @@ import {
 import { debounce } from 'lodash';
 import { deprecatedCreateFlash as createFlash } from '~/flash';
 import httpStatusCodes from '~/lib/utils/http_status';
+import { isNumeric } from '~/lib/utils/number_utils';
 import { sprintf, s__, __ } from '~/locale';
-import { isNumeric } from '../../../utils';
 
 export default {
   components: {

ee/app/assets/javascripts/audit_events/utils.js

 import { parsePikadayDate, pikadayToString } from '~/lib/utils/datetime_utility';
 import { AVAILABLE_TOKEN_TYPES, AUDIT_FILTER_CONFIGS } from './constants';
 
-export const isNumeric = (str) => {
-  return !Number.isNaN(parseInt(str, 10));
-};
-
 export const getTypeFromEntityType = (entityType) => {
   return AUDIT_FILTER_CONFIGS.find(
     ({ entityType: configEntityType }) => configEntityType === entityType,

ee/app/assets/javascripts/groups/settings/compliance_frameworks/utils.js

 import Api from '~/api';
 import httpStatus from '~/lib/utils/http_status';
+import { isNumeric } from '~/lib/utils/number_utils';
 import { EDIT_PATH_ID_FORMAT, PIPELINE_CONFIGURATION_PATH_FORMAT } from './constants';
 
-const isNumeric = (value) => {
-  return !Number.isNaN(parseInt(value, 10));
-};
-
 export const injectIdIntoEditPath = (path, id) => {
   if (!path.match(EDIT_PATH_ID_FORMAT) || !isNumeric(id)) {
     return '';

ee/spec/frontend/audit_events/utils_spec.js

 import {
-  isNumeric,
   getTypeFromEntityType,
   getEntityTypeFromType,
   parseAuditEventSearchQuery,
@@ -7,34 +6,6 @@ import {
 } from 'ee/audit_events/utils';
 
 describe('Audit Event Utils', () => {
-  describe('isNumeric', () => {
-    describe.each`
-      value
-      ${false}
-      ${true}
-      ${undefined}
-      ${null}
-      ${'abcd'}
-      ${''}
-    `('for a list of non-numeric values', ({ value }) => {
-      it(`returns false for ${value}`, () => {
-        expect(isNumeric(value)).toBe(false);
-      });
-    });
-
-    describe.each`
-      value
-      ${0}
-      ${12345}
-      ${'0'}
-      ${'6789'}
-    `('for a list of numeric values', ({ value }) => {
-      it(`returns true for ${value}`, () => {
-        expect(isNumeric(value)).toBe(true);
-      });
-    });
-  });
-
   describe('getTypeFromEntityType', () => {
     it('returns the correct type when given a valid entity type', () => {
       expect(getTypeFromEntityType('User')).toEqual('user');

spec/frontend/lib/utils/number_utility_spec.js

@@ -9,6 +9,7 @@ import {
   median,
   changeInPercent,
   formattedChangeInPercent,
+  isNumeric,
 } from '~/lib/utils/number_utils';
 
 describe('Number Utils', () => {
@@ -162,4 +163,25 @@ describe('Number Utils', () => {
       expect(formattedChangeInPercent(0, 1, { nonFiniteResult: '*' })).toBe('*');
     });
   });
+
+  describe('isNumeric', () => {
+    it.each`
+      value        | outcome
+      ${0}         | ${true}
+      ${12345}     | ${true}
+      ${'0'}       | ${true}
+      ${'12345'}   | ${true}
+      ${1.0}       | ${true}
+      ${'1.0'}     | ${true}
+      ${'abcd'}    | ${false}
+      ${'abcd100'} | ${false}
+      ${''}        | ${false}
+      ${false}     | ${false}
+      ${true}      | ${false}
+      ${undefined} | ${false}
+      ${null}      | ${false}
+    `('when called with $value it returns $outcome', ({ value, outcome }) => {
+      expect(isNumeric(value)).toBe(outcome);
+    });
+  });
 });