Add latest changes from gitlab-org/gitlab@master

1 files changed, 33 insertions, 11 deletions

diff --git a/app/assets/javascripts/lib/utils/icon_utils.js b/app/assets/javascripts/lib/utils/icon_utils.js
index 7b8dd9bbef7..97ee773358d 100644
--- a/app/assets/javascripts/lib/utils/icon_utils.js
+++ b/app/assets/javascripts/lib/utils/icon_utils.js
@@ -1,18 +1,40 @@
-/* eslint-disable import/prefer-default-export */
-
+import { memoize } from 'lodash';
 import axios from '~/lib/utils/axios_utils';
 
 /**
- * Retrieve SVG icon path content from gitlab/svg sprite icons
- * @param {String} name
+ * Resolves to a DOM that contains GitLab icons
+ * in svg format. Memoized to avoid duplicate requests
  */
-export const getSvgIconPathContent = name =>
+const getSvgDom = memoize(() =>
   axios
     .get(gon.sprite_icons)
-    .then(({ data: svgs }) =>
-      new DOMParser()
-        .parseFromString(svgs, 'text/xml')
-        .querySelector(`#${name} path`)
-        .getAttribute('d'),
-    )
+    .then(({ data: svgs }) => new DOMParser().parseFromString(svgs, 'text/xml'))
+    .catch(() => {
+      getSvgDom.cache.clear();
+    }),
+);
+
+/**
+ * Clears the memoized SVG content.
+ *
+ * You probably don't need to invoke this function unless
+ * sprite_icons are updated.
+ */
+export const clearSvgIconPathContentCache = () => {
+  getSvgDom.cache.clear();
+};
+
+/**
+ * Retrieve SVG icon path content from gitlab/svg sprite icons.
+ *
+ * Content loaded is cached.
+ *
+ * @param {String} name - Icon name
+ * @returns A promise that resolves to the svg path
+ */
+export const getSvgIconPathContent = name =>
+  getSvgDom()
+    .then(doc => {
+      return doc.querySelector(`#${name} path`).getAttribute('d');
+    })
     .catch(() => null);