Commit 5bfaaf47 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'ph/324995/fixedUndefinedCategoryInOldEmojiMenu' into 'master'

Fixes the old emoji menu showing a undefined category

See merge request gitlab-org/gitlab!56860
parents 105806e7 4f88736e
...@@ -2,7 +2,7 @@ import { escape, minBy } from 'lodash'; ...@@ -2,7 +2,7 @@ import { escape, minBy } from 'lodash';
import emojiAliases from 'emojis/aliases.json'; import emojiAliases from 'emojis/aliases.json';
import AccessorUtilities from '../lib/utils/accessor'; import AccessorUtilities from '../lib/utils/accessor';
import axios from '../lib/utils/axios_utils'; import axios from '../lib/utils/axios_utils';
import { CATEGORY_ICON_MAP } from './constants'; import { CATEGORY_ICON_MAP, FREQUENTLY_USED_KEY } from './constants';
let emojiMap = null; let emojiMap = null;
let validEmojiNames = null; let validEmojiNames = null;
...@@ -162,6 +162,9 @@ let emojiCategoryMap; ...@@ -162,6 +162,9 @@ let emojiCategoryMap;
export function getEmojiCategoryMap() { export function getEmojiCategoryMap() {
if (!emojiCategoryMap) { if (!emojiCategoryMap) {
emojiCategoryMap = CATEGORY_NAMES.reduce((acc, category) => { emojiCategoryMap = CATEGORY_NAMES.reduce((acc, category) => {
if (category === FREQUENTLY_USED_KEY) {
return acc;
}
return { ...acc, [category]: [] }; return { ...acc, [category]: [] };
}, {}); }, {});
Object.keys(emojiMap).forEach((name) => { Object.keys(emojiMap).forEach((name) => {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment