Merge branch 'main' into refactor/api-request-shape-2

Signed-off-by: Adam Setch <adam.setch@outlook.com>

Author: setchy

package.json

@@ -87,6 +87,7 @@
     "@octokit/oauth-methods": "6.0.2",
     "@octokit/openapi-types": "27.0.0",
     "@octokit/request": "10.0.7",
+    "@octokit/types": "16.0.0",
     "@parcel/watcher": "2.5.4",
     "@primer/css": "22.1.0",
     "@primer/octicons-react": "19.21.2",
@@ -115,7 +116,7 @@
     "electron-builder": "26.4.0",
     "final-form": "5.0.0",
     "graphql": "16.12.0",
-    "html-webpack-plugin": "5.6.5",
+    "html-webpack-plugin": "5.6.6",
     "husky": "9.1.7",
     "identity-obj-proxy": "3.0.0",
     "jest": "30.2.0",

pnpm-lock.yaml

@@ -9,6 +9,8 @@ import { mockAuth, mockSettings } from '../__mocks__/state-mocks';
 
 import { AppContext, type AppContextState } from '../context/App';
 
+export type DeepPartial<T> = { [K in keyof T]?: DeepPartial<T[K]> };
+
 /**
  * Props for the AppContextProvider wrapper
  */

src/renderer/__helpers__/test-utils.tsx

@@ -23,7 +23,7 @@ export const AvatarWithFallback: React.FC<AvatarWithFallbackProps> = ({
   size = Size.MEDIUM,
   userType = 'User',
 }) => {
-  const [isBroken, setIsBroken] = useState(false);
+  const [hasBrokenAvatarSource, setHasBrokenAvatarSource] = useState(false);
 
   const isNonHuman = isNonHumanUser(userType);
   const DefaultUserIcon = getDefaultUserIcon(userType);
@@ -36,12 +36,12 @@ export const AvatarWithFallback: React.FC<AvatarWithFallbackProps> = ({
       direction="horizontal"
       gap="condensed"
     >
-      {!src || isBroken ? (
+      {!src || hasBrokenAvatarSource ? (
         <DefaultUserIcon size={size} />
       ) : (
         <Avatar
           alt={alt}
-          onError={() => setIsBroken(true)}
+          onError={() => setHasBrokenAvatarSource(true)}
           size={size}
           square={isNonHuman}
           src={src}

src/renderer/components/avatars/AvatarWithFallback.tsx

@@ -11,12 +11,14 @@ export interface TooltipProps {
 }
 
 export const Tooltip: FC<TooltipProps> = (props: TooltipProps) => {
-  const [showTooltip, setShowTooltip] = useState(false);
+  const [shouldShowTooltipContents, setShouldShowTooltipContents] =
+    useState(false);
+
   const scrollContainerRef = useRef<HTMLElement | null>(null);
   const overlayRef = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
-    if (!showTooltip) {
+    if (!shouldShowTooltipContents) {
       return;
     }
 
@@ -42,7 +44,7 @@ export const Tooltip: FC<TooltipProps> = (props: TooltipProps) => {
     scrollContainerRef.current = findScrollContainer(tooltipButton);
 
     const handleScroll = () => {
-      setShowTooltip(false);
+      setShouldShowTooltipContents(false);
     };
 
     const handleClickOutside = (event: MouseEvent) => {
@@ -51,7 +53,7 @@ export const Tooltip: FC<TooltipProps> = (props: TooltipProps) => {
         !overlayRef.current.contains(event.target as Node) &&
         !tooltipButton?.contains(event.target as Node)
       ) {
-        setShowTooltip(false);
+        setShouldShowTooltipContents(false);
       }
     };
 
@@ -67,19 +69,21 @@ export const Tooltip: FC<TooltipProps> = (props: TooltipProps) => {
       }
       document.removeEventListener('mousedown', handleClickOutside);
     };
-  }, [showTooltip, props.name]);
+  }, [shouldShowTooltipContents, props.name]);
 
   return (
     <AnchoredOverlay
       align="center"
-      open={showTooltip}
+      open={shouldShowTooltipContents}
       renderAnchor={(anchorProps) => (
         <button
           {...anchorProps}
           aria-label={props.name}
           data-testid={`tooltip-icon-${props.name}`}
           id={props.name}
-          onClick={() => setShowTooltip(!showTooltip)}
+          onClick={() =>
+            setShouldShowTooltipContents(!shouldShowTooltipContents)
+          }
           type="button"
         >
           <QuestionIcon className="text-gitify-tooltip-icon" />

src/renderer/components/fields/Tooltip.tsx

@@ -83,9 +83,7 @@ export const FilterSection = <T extends FilterSettingsValue>({
                 key={type as string}
                 label={typeTitle}
                 name={typeTitle}
-                onChange={(evt) =>
-                  updateFilter(filterSetting, type, evt.target.checked)
-                }
+                onChange={() => updateFilter(filterSetting, type, !isChecked)}
                 tooltip={
                   typeDescription ? <Text>{typeDescription}</Text> : null
                 }

src/renderer/components/filters/FilterSection.tsx

@@ -32,7 +32,8 @@ export const TokenSearchInput: FC<TokenSearchInputProps> = ({
   onRemove,
 }) => {
   const [inputValue, setInputValue] = useState('');
-  const [showSuggestions, setShowSuggestions] = useState(false);
+  const [shouldShowFilterSuggestions, setShouldShowFilterSuggestions] =
+    useState(false);
 
   const tokenItems = tokens.map((text, id) => ({ id, text }));
 
@@ -54,9 +55,9 @@ export const TokenSearchInput: FC<TokenSearchInputProps> = ({
   function onKeyDown(e: React.KeyboardEvent<HTMLInputElement>) {
     if (INPUT_KEY_EVENTS.has(e.key)) {
       tryAddToken(e);
-      setShowSuggestions(false);
+      setShouldShowFilterSuggestions(false);
     } else if (e.key === 'ArrowDown') {
-      setShowSuggestions(true);
+      setShouldShowFilterSuggestions(true);
     }
   }
 
@@ -78,7 +79,7 @@ export const TokenSearchInput: FC<TokenSearchInputProps> = ({
           block
           onBlur={(e) => {
             tryAddToken(e);
-            setShowSuggestions(false);
+            setShouldShowFilterSuggestions(false);
           }}
           onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
             setInputValue(e.target.value);
@@ -87,17 +88,17 @@ export const TokenSearchInput: FC<TokenSearchInputProps> = ({
               !val.includes(SEARCH_DELIMITER) ||
               val.endsWith(SEARCH_DELIMITER)
             ) {
-              setShowSuggestions(true);
+              setShouldShowFilterSuggestions(true);
             } else {
-              setShowSuggestions(false);
+              setShouldShowFilterSuggestions(false);
             }
           }}
           onFocus={(e) => {
             if (
               showSuggestionsOnFocusIfEmpty &&
               (e.target as HTMLInputElement).value.trim() === ''
             ) {
-              setShowSuggestions(true);
+              setShouldShowFilterSuggestions(true);
             }
           }}
           onKeyDown={onKeyDown}
@@ -114,7 +115,7 @@ export const TokenSearchInput: FC<TokenSearchInputProps> = ({
         />
         <SearchFilterSuggestions
           inputValue={inputValue}
-          open={showSuggestions}
+          open={shouldShowFilterSuggestions}
         />
       </div>
     </Stack>

src/renderer/components/filters/TokenSearchInput.tsx

@@ -4,14 +4,14 @@ import { mockSettings } from '../../__mocks__/state-mocks';
 
 import type { GitifyMilestone } from '../../types';
 
-import { MetricGroup } from './MetricGroup';
+import { MetricGroup, type MetricGroupProps } from './MetricGroup';
 
 describe('renderer/components/metrics/MetricGroup.tsx', () => {
   describe('showPills disabled', () => {
     it('should not render any pills when showPills is disabled', async () => {
       const mockNotification = mockGitifyNotification;
 
-      const props = {
+      const props: MetricGroupProps = {
         notification: mockNotification,
       };
 
@@ -27,7 +27,7 @@ describe('renderer/components/metrics/MetricGroup.tsx', () => {
       const mockNotification = mockGitifyNotification;
       mockNotification.subject.linkedIssues = ['#1'];
 
-      const props = {
+      const props: MetricGroupProps = {
         notification: mockNotification,
       };
 
@@ -39,7 +39,7 @@ describe('renderer/components/metrics/MetricGroup.tsx', () => {
       const mockNotification = mockGitifyNotification;
       mockNotification.subject.linkedIssues = ['#1', '#2'];
 
-      const props = {
+      const props: MetricGroupProps = {
         notification: mockNotification,
       };
 
@@ -53,7 +53,7 @@ describe('renderer/components/metrics/MetricGroup.tsx', () => {
       const mockNotification = mockGitifyNotification;
       mockNotification.subject.commentCount = null;
 
-      const props = {
+      const props: MetricGroupProps = {
         notification: mockNotification,
       };
 
@@ -65,7 +65,7 @@ describe('renderer/components/metrics/MetricGroup.tsx', () => {
       const mockNotification = mockGitifyNotification;
       mockNotification.subject.commentCount = 1;
 
-      const props = {
+      const props: MetricGroupProps = {
         notification: mockNotification,
       };
 
@@ -77,7 +77,7 @@ describe('renderer/components/metrics/MetricGroup.tsx', () => {
       const mockNotification = mockGitifyNotification;
       mockNotification.subject.commentCount = 2;
 
-      const props = {
+      const props: MetricGroupProps = {
         notification: mockNotification,
       };
 
@@ -91,7 +91,7 @@ describe('renderer/components/metrics/MetricGroup.tsx', () => {
       const mockNotification = mockGitifyNotification;
       mockNotification.subject.labels = ['enhancement', 'good-first-issue'];
 
-      const props = {
+      const props: MetricGroupProps = {
         notification: mockNotification,
       };
 
@@ -108,7 +108,7 @@ describe('renderer/components/metrics/MetricGroup.tsx', () => {
         state: 'OPEN',
       } as GitifyMilestone;
 
-      const props = {
+      const props: MetricGroupProps = {
         notification: mockNotification,
       };
 
@@ -123,7 +123,7 @@ describe('renderer/components/metrics/MetricGroup.tsx', () => {
         state: 'CLOSED',
       } as GitifyMilestone;
 
-      const props = {
+      const props: MetricGroupProps = {
         notification: mockNotification,
       };
 

src/renderer/components/metrics/MetricGroup.test.tsx

@@ -14,7 +14,7 @@ import { type GitifyNotification, IconColor } from '../../types';
 import { getPullRequestReviewIcon } from '../../utils/icons';
 import { MetricPill } from './MetricPill';
 
-interface MetricGroupProps {
+export interface MetricGroupProps {
   notification: GitifyNotification;
 }