Merge branch '59232-add-storage-counter-ce' into 'master'

CE backport for Storage Counter changes

Closes #59232

See merge request gitlab-org/gitlab-ce!29206

3 files changed, 25 insertions, 1 deletions

diff --git a/app/assets/javascripts/lib/utils/bootstrap_linked_tabs.js b/app/assets/javascripts/lib/utils/bootstrap_linked_tabs.js
index a24c71aeab1..28a7ebfdc69 100644
--- a/app/assets/javascripts/lib/utils/bootstrap_linked_tabs.js
+++ b/app/assets/javascripts/lib/utils/bootstrap_linked_tabs.js
@@ -51,6 +51,7 @@ export default class LinkedTabs {
 
     this.defaultAction = this.options.defaultAction;
     this.action = this.options.action || this.defaultAction;
+    this.hashedTabs = this.options.hashedTabs || false;
 
     if (this.action === 'show') {
       this.action = this.defaultAction;
@@ -58,6 +59,10 @@ export default class LinkedTabs {
 
     this.currentLocation = window.location;
 
+    if (this.hashedTabs) {
+      this.action = this.currentLocation.hash || this.action;
+    }
+
     const tabSelector = `${this.options.parentEl} a[data-toggle="tab"]`;
 
     // since this is a custom event we need jQuery :(
@@ -91,7 +96,9 @@ export default class LinkedTabs {
 
     copySource.replace(/\/+$/, '');
 
-    const newState = `${copySource}${this.currentLocation.search}${this.currentLocation.hash}`;
+    const newState = this.hashedTabs
+      ? copySource
+      : `${copySource}${this.currentLocation.search}${this.currentLocation.hash}`;
 
     window.history.replaceState(
       {
diff --git a/app/assets/javascripts/lib/utils/number_utils.js b/app/assets/javascripts/lib/utils/number_utils.js
index 9ddfb4bca11..61c8b8803d7 100644
--- a/app/assets/javascripts/lib/utils/number_utils.js
+++ b/app/assets/javascripts/lib/utils/number_utils.js
@@ -100,3 +100,9 @@ export function numberToHumanSize(size) {
  * @returns {Float} The summed value
  */
 export const sum = (a = 0, b = 0) => a + b;
+
+/**
+ * Checks if the provided number is odd
+ * @param {Int} number
+ */
+export const isOdd = (number = 0) => number % 2;
diff --git a/spec/frontend/lib/utils/number_utility_spec.js b/spec/frontend/lib/utils/number_utility_spec.js
index 818404bad81..77d7478d317 100644
--- a/spec/frontend/lib/utils/number_utility_spec.js
+++ b/spec/frontend/lib/utils/number_utility_spec.js
@@ -5,6 +5,7 @@ import {
   bytesToGiB,
   numberToHumanSize,
   sum,
+  isOdd,
 } from '~/lib/utils/number_utils';
 
 describe('Number Utils', () => {
@@ -98,4 +99,14 @@ describe('Number Utils', () => {
       expect([1, 2, 3, 4, 5].reduce(sum)).toEqual(15);
     });
   });
+
+  describe('isOdd', () => {
+    it('should return 0 with a even number', () => {
+      expect(isOdd(2)).toEqual(0);
+    });
+
+    it('should return 1 with a odd number', () => {
+      expect(isOdd(1)).toEqual(1);
+    });
+  });
 });