fixed a few issues on the leveling page and added /tutorials

almeidx · Aug 4, 2021 · 90045b7 · 90045b7 · vercel · Aug 4, 2021
1 parent b9d377c
commit 90045b7
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 31 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -31,6 +31,7 @@
         "selector": "function"
       }
     ],
+    "@typescript-eslint/no-dynamic-delete": 0,
     "@typescript-eslint/no-extraneous-class": 0,
     "@typescript-eslint/no-non-null-assertion": 0,
     "@typescript-eslint/space-before-function-paren": 0,

diff --git a/packages/bot/next.config.js b/packages/bot/next.config.js
@@ -32,6 +32,11 @@ module.exports = {
         permanent: true,
         source: '/docs',
       },
+      {
+        destination: 'https://www.youtube.com/playlist?list=PLeDA5I-uV0EcC1FDT6JufwxMjBun9iMx2',
+        permanent: true,
+        source: '/tutorials',
+      },
     ];
   },
   /**

diff --git a/packages/bot/src/components/dashboard/XpMultiplier.tsx b/packages/bot/src/components/dashboard/XpMultiplier.tsx
@@ -62,12 +62,12 @@ export default function XpMultiplier({
         </div>
       </div>
 
-      {type !== 'global' && (
+      {type !== 'global' && targets && (
         <div className="w-full mx-2">
           <Selector
             id={`m-${id}-selector`}
             limit={getDatabaseLimit('xpMultiplierTargets', premium).maxLength}
-            initialItems={targets!}
+            initialItems={targets}
             items={type === 'channel' ? channels : roles}
             onSelect={(i) => onItemChange(i, id)}
             type={type}

diff --git a/packages/bot/src/components/dashboard/pages/Leveling.tsx b/packages/bot/src/components/dashboard/pages/Leveling.tsx
@@ -3,7 +3,6 @@ import cloneDeep from 'lodash.clonedeep';
 import { MouseEventHandler, useCallback, useContext, useEffect, useRef, useState } from 'react';
 import { BiLayerPlus } from 'react-icons/bi';
 
-import type { DatabaseGuildChanges } from '../../../__generated__/updateDatabaseGuildMutation.graphql';
 import { GuildContext } from '../../../contexts/GuildContext';
 import {
   AutoResetLevels,
@@ -83,6 +82,15 @@ const resolveAutoResetLevelsTypeByName = (name: string) =>
     : AutoResetLevels.NONE;
 
 const resolveInitialXpResponseType = (database: DashboardDatabaseGuild) =>
+  database.xpResponseType
+    ? /^\d+$/.test(database.xpResponseType)
+      ? ResponseType.CHANNEL
+      : database.xpResponseType === 'dm'
+      ? ResponseType.DM
+      : ResponseType.SAME_CHANNEL
+    : ResponseType.NONE;
+
+const resolveInitialXpResponseTypeValue = (database: DashboardDatabaseGuild) =>
   database.xpResponseType
     ? /^\d+$/.test(database.xpResponseType)
       ? ResponseType.CHANNEL
@@ -107,14 +115,14 @@ export default function Leveling({ channels, database, roles, openMenu }: Leveli
   const [xpMultipliers, setXpMultipliers] = useState<MultiplierWithStringValue[]>(
     database.xpMultipliers.map((m) => ({ ...m, multiplier: m.multiplier.toString() })),
   );
-  const [xpResponseType, setXpResponseType] = useState<string>(resolveInitialXpResponseType(database));
+  const [xpResponseType, setXpResponseType] = useState<string>(resolveInitialXpResponseTypeValue(database));
   const [xpChannelsType, setXpChannelsType] = useState<'whitelist' | 'blacklist'>(
     database.xpBlacklistedChannels ? 'blacklist' : 'whitelist',
   );
   const [newXpMultiplierType, setNewXpMultiplierType] = useState<Multiplier['type']>('channel');
   const [newXpRolesLevel, setNewXpRolesLevel] = useState<string>('');
   const newXpRoleSubmitRef = useRef<HTMLButtonElement>(null);
-  const { addChange, changes, removeChange } = useContext(GuildContext);
+  const { addChange } = useContext(GuildContext);
 
   const xpMessageLimit = getDatabaseLimit('xpMessage', database.premium).maxLength;
   const xpChannelsLimit = getDatabaseLimit('xpChannels', database.premium).maxLength;
@@ -149,7 +157,6 @@ export default function Leveling({ channels, database, roles, openMenu }: Leveli
       const clone = cloneDeep<Record<string, Snowflake[]>>(xpRoles);
 
       if (roleIds.length) clone[level] = roleIds;
-      // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
       else delete clone[level];
 
       setXpRoles(clone);
@@ -162,16 +169,14 @@ export default function Leveling({ channels, database, roles, openMenu }: Leveli
     const currentType = `${xpChannelsType}` as const;
     setXpChannelsType(currentType === 'blacklist' ? 'whitelist' : 'blacklist');
 
-    const clone = cloneDeep<Partial<DatabaseGuildChanges>>(changes);
-
     if (currentType === 'blacklist') {
-      if ('xpBlacklistedChannels' in clone) removeChange('xpBlacklistedChannels');
+      addChange('xpBlacklistedChannels', null);
       return addChange('xpWhitelistedChannels', xpChannels);
     }
 
-    if ('xpWhitelistedChannels' in clone) removeChange('xpWhitelistedChannels');
+    addChange('xpWhitelistedChannels', null);
     addChange('xpBlacklistedChannels', xpChannels);
-  }, [addChange, changes, removeChange, xpChannels, xpChannelsType]);
+  }, [addChange, xpChannels, xpChannelsType]);
 
   const handleXpMultiplierDelete: XpMultiplierOnDeleteFn = useCallback(
     (id) => {
@@ -265,7 +270,7 @@ export default function Leveling({ channels, database, roles, openMenu }: Leveli
             <div className="w-full lg:w-1/2">
               <BasicSelect
                 closeOnSelect
-                initialItem={resolveXpResponseNameByType(ResponseType.SAME_CHANNEL)}
+                initialItem={resolveXpResponseNameByType(resolveInitialXpResponseType(database))}
                 items={['Same Channel', 'DM', 'Custom Channel', 'None']}
                 onSelect={(i) => {
                   const type = resolveXpResponseTypeByName(i);
@@ -457,9 +462,11 @@ export default function Leveling({ channels, database, roles, openMenu }: Leveli
           <Selector
             id="xpChannels"
             initialItems={
-              (database.xpBlacklistedChannels as Snowflake[] | null) ??
-              (database.xpWhitelistedChannels as Snowflake[] | null) ??
-              []
+              database.xpBlacklistedChannels?.length
+                ? (database.xpBlacklistedChannels as Snowflake[])
+                : database.xpWhitelistedChannels?.length
+                ? (database.xpWhitelistedChannels as Snowflake[])
+                : []
             }
             items={channels}
             limit={xpChannelsLimit}

diff --git a/packages/bot/src/contexts/GuildContext.tsx b/packages/bot/src/contexts/GuildContext.tsx
@@ -42,7 +42,6 @@ interface GuildContextData {
   data: DatabaseChanges | null;
   errors: string[];
   guildId: Snowflake | null;
-  removeChange: (key: keyof DatabaseChanges) => void;
   section: Section;
   updateData: (newData: DashboardDatabaseGuild) => void;
   updateGuildId: (newId: Snowflake) => void;
@@ -159,11 +158,11 @@ export default function GuildContextProvider({ children }: GuildContextProps) {
         data &&
         (data[key] === value ||
           (Array.isArray(value) && !value.length && data[key] === null) ||
+          (Array.isArray(data[key]) && !(data[key] as any[]).length && value === null) ||
           (data[key] === null && value === 0) ||
           (data[key] === 0 && value === null))
       ) {
         if (key in clone) {
-          // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
           delete clone[key];
           setChanges(clone);
           updateErrorsAndWarnings(clone, data);
@@ -178,19 +177,6 @@ export default function GuildContextProvider({ children }: GuildContextProps) {
     [changes, data, updateErrorsAndWarnings],
   );
 
-  const removeChange = useCallback(
-    (key: keyof DatabaseChanges) => {
-      const clone = cloneDeep<Partial<DatabaseChanges>>(changes);
-
-      if (key in clone) {
-        // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
-        delete clone[key];
-        setChanges(clone);
-      }
-    },
-    [changes],
-  );
-
   const clearChanges = useCallback(() => setChanges({}), []);
 
   const updateGuildId = useCallback(
@@ -210,7 +196,6 @@ export default function GuildContextProvider({ children }: GuildContextProps) {
         data,
         errors,
         guildId,
-        removeChange,
         section,
         updateData: setData,
         updateGuildId,