Fix deprecation warnings

airdcpp-web · Jun 19, 2024 · 4f628ab · 4f628ab
1 parent d5f081b
commit 4f628ab
Show file tree

Hide file tree

Showing 12 changed files with 109 additions and 119 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/resources/locales/en/webui.main.json b/resources/locales/en/webui.main.json
@@ -261,6 +261,9 @@
   "common": {
     "actions": {
       "copy": "Copy",
+      "copyPath": "Copy path",
+      "copySize": "Copy size",
+      "copyTth": "Copy TTH",
       "download": "Download",
       "downloadTo": "Download to...",
       "findNfo": "Find NFO",
@@ -280,6 +283,9 @@
       "notifications": {
         "ignoreUserSuccess": "User {{item.nicks}} was added in ignored users",
         "unignoreUserSuccess": "User {{item.nicks}} was removed from ignored users",
+        "copyPathSuccess": "Path was copied to clipboard",
+        "copySizeSuccess": "Size was copied to clipboard",
+        "copyTTHSuccess": "TTH was copied to clipboard",
         "copyMagnetSuccess": "Magnet link was copied to clipboard",
         "copySuccess": "Text was copied to clipboard"
       },

diff --git a/src/actions/ui/queue/QueueBundleActions.ts b/src/actions/ui/queue/QueueBundleActions.ts
@@ -80,7 +80,7 @@ export const QueueBundleSearchAction = {
 };
 
 export const QueueBundleSearchAlternatesAction = {
-  id: 'searchAlternates',
+  id: 'searchBundleAlternates',
   displayName: 'Search for alternates',
   icon: IconConstants.SEARCH_ALTERNATES,
   filter: itemNotFinished,

diff --git a/src/actions/ui/queue/QueueBundleSourceActions.ts b/src/actions/ui/queue/QueueBundleSourceActions.ts
@@ -6,11 +6,6 @@ import IconConstants from 'constants/IconConstants';
 import * as API from 'types/api';
 import * as UI from 'types/ui';
 
-/*interface ActionBundleSourceData {
-  source: API.QueueBundleSource;
-  bundle: API.QueueBundle;
-}*/
-
 type ActionHandlerType = UI.ActionHandler<API.QueueBundleSource, API.QueueBundle>;
 
 const handleRemoveBundleSource: ActionHandlerType = ({

diff --git a/src/actions/ui/share/ShareActions.ts b/src/actions/ui/share/ShareActions.ts
@@ -11,8 +11,8 @@ const handleRefresh = () => {
 };
 
 export const ShareRefreshAction = {
-  id: 'refresh',
-  displayName: 'Refresh',
+  id: 'refreshAll',
+  displayName: 'Refresh all',
   access: API.AccessEnum.SETTINGS_EDIT,
   icon: IconConstants.REFRESH_COLORED,
   handler: handleRefresh,

diff --git a/src/components/CountLabel.tsx b/src/components/CountLabel.tsx
@@ -18,14 +18,10 @@ export interface CountLabelProps {
   onClick?: (evt: React.SyntheticEvent<any>) => void;
 }
 
-const CountLabel: React.FC<CountLabelProps> = ({
-  urgencies,
-  empty,
-  size,
-  className,
-  circular,
-  onClick,
-}) => {
+const CountLabel = React.forwardRef<HTMLDivElement, CountLabelProps>(function CountLabel(
+  { urgencies, empty = false, size, className, circular = false, onClick },
+  ref,
+) {
   // We must always have valid urgencies when the component is rendered (checked by AnimatedCountLabel)
   if (!urgencies) {
     return null;
@@ -46,11 +42,11 @@ const CountLabel: React.FC<CountLabelProps> = ({
   );
 
   return (
-    <div className={labelClassName} onClick={onClick}>
+    <div ref={ref} className={labelClassName} onClick={onClick}>
       {empty ? null : urgencies[max]}
     </div>
   );
-};
+});
 
 /*CountLabel.propTypes = {
 	// Urgency mapping [ urgency -> count ]
@@ -63,21 +59,22 @@ const CountLabel: React.FC<CountLabelProps> = ({
   empty: PropTypes.bool,
 };*/
 
-CountLabel.defaultProps = {
-  empty: false,
-  size: '',
-  circular: false,
-};
-
 // Fade out the label when there are no counts
-const AnimatedCountLabel: React.FC<CountLabelProps> = (props) => (
-  <TransitionGroup component={null}>
-    {!!props.urgencies && (
-      <CSSTransition classNames="label-transition" timeout={{ enter: 100, exit: 1500 }}>
-        <CountLabel key="label" {...props} />
-      </CSSTransition>
-    )}
-  </TransitionGroup>
-);
+const AnimatedCountLabel: React.FC<CountLabelProps> = (props) => {
+  const nodeRef = React.useRef(null);
+  return (
+    <TransitionGroup component={null}>
+      {!!props.urgencies && (
+        <CSSTransition
+          nodeRef={nodeRef}
+          classNames="label-transition"
+          timeout={{ enter: 100, exit: 1500 }}
+        >
+          <CountLabel ref={nodeRef} key="label" {...props} />
+        </CSSTransition>
+      )}
+    </TransitionGroup>
+  );
+};
 
 export default AnimatedCountLabel;