Merge pull request bigbluebutton#18742 from ramonlsouza/bb-lodash

fix: remove lodash
antonbsa · Sep 7, 2023 · d7c87ab · d7c87ab
2 parents 809ba9d + 97b8a0e
commit d7c87ab
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/...r-list/user-list-content/user-participants/user-list-participants/list-item/component.tsx b/...r-list/user-list-content/user-participants/user-list-participants/list-item/component.tsx
@@ -8,7 +8,8 @@ import { EMOJI_STATUSES } from '/imports/utils/statuses';
 import TooltipContainer from '/imports/ui/components/common/tooltip/container';
 import Auth from '/imports/ui/services/auth';
 import { LockSettings } from '/imports/ui/Types/meeting';
-import _ from 'lodash';
+import { uniqueId } from '/imports/utils/string-utils';
+
 const messages = defineMessages({
   moderator: {
     id: 'app.userList.moderator',
@@ -61,14 +62,14 @@ const UserListItem: React.FC<UserListItemProps> = ({ user, lockSettings }) => {
     (user.mobile && LABEL.mobile) && intl.formatMessage(messages.mobile),
     (user.locked && lockSettings.hasActiveLockSetting && !user.isModerator) 
     && (
-      <span key={_.uniqueId('lock-')}>
+      <span key={uniqueId('lock-')}>
           <Icon iconName="lock" />
           &nbsp;
           {intl.formatMessage(messages.locked)}
         </span>
     ),
     user.lastBreakoutRoom?.currentlyInRoom && (
-      <span key={_.uniqueId('breakout-')}>
+      <span key={uniqueId('breakout-')}>
           <Icon iconName="rooms" />
           &nbsp;
           {user.lastBreakoutRoom?.shortName
@@ -77,7 +78,7 @@ const UserListItem: React.FC<UserListItemProps> = ({ user, lockSettings }) => {
         </span>
     ),
     (user.cameras.length > 0 && LABEL.sharingWebcam) && (
-      <span key={_.uniqueId('breakout-')}>
+      <span key={uniqueId('breakout-')}>
           { user.pinned === true
             ? <Icon iconName="pin-video_on" />
             : <Icon iconName="video" /> }

diff --git a/bigbluebutton-html5/package-lock.json b/bigbluebutton-html5/package-lock.json
diff --git a/bigbluebutton-html5/package.json b/bigbluebutton-html5/package.json
@@ -61,7 +61,6 @@
     "html-to-image": "^1.9.0",
     "immutability-helper": "~2.8.1",
     "langmap": "0.0.16",
-    "lodash": "^4.17.21",
     "makeup-screenreader-trap": "0.0.5",
     "meteor-node-stubs": "^1.2.1",
     "mobx": "6.4.2",
@@ -109,9 +108,8 @@
     "yaml": "^2.2.2"
   },
   "devDependencies": {
-    "@types/lodash": "^4.14.197",
-    "@types/react-virtualized": "^9.21.22",
     "@types/meteor": "^2.9.3",
+    "@types/react-virtualized": "^9.21.22",
     "@types/styled-components": "^5.1.26",
     "@types/uuid": "^9.0.2",
     "@typescript-eslint/eslint-plugin": "^6.4.0",