update test script

juli1 · juli1 · commit cae54e887ada · 2022-08-24T10:49:59.000-06:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Install packages
         run: npm install
       - name: Run tests
-        run: npm run build:main && npm test
+        run: npm run build && npm test
       - name: Build the Electron App
         run: npm run package
       - name: Build/release Electron app
diff --git a/src/renderer/components/CookbookTable/CookbookTable.tsx b/src/renderer/components/CookbookTable/CookbookTable.tsx
@@ -18,12 +18,12 @@ import {
   Logos,
 } from '@codiga/codiga-components';
 
-import { getCookbookUrl, getGroupUrl } from '../../../renderer/utils/urlUtils';
-import { getAvatarUrl } from '../../../renderer/utils/userUtils';
-import { AssistantCookbook } from '../../../renderer/types/assistantTypes';
-import { PageTypes } from '../../../renderer/types/pageTypes';
-import FavoriteCookbook from '../../../renderer/components/Favorite/FavoriteCookbook';
-import UserLink from '../../../renderer/components/UserLink';
+import { getCookbookUrl, getGroupUrl } from '../../utils/urlUtils';
+import { getAvatarUrl } from '../../utils/userUtils';
+import { AssistantCookbook } from '../../types/assistantTypes';
+import { PageTypes } from '../../types/pageTypes';
+import FavoriteCookbook from '../../components/Favorite/FavoriteCookbook';
+import UserLink from '../../components/UserLink';
 import VotesCurrent from '../VotesCurrent';
 
 const Td = (props: TableCellProps) => (
diff --git a/src/renderer/components/CookbookTable/CookbookTableEmpty.tsx b/src/renderer/components/CookbookTable/CookbookTableEmpty.tsx
@@ -1,6 +1,6 @@
 import { Link } from '@chakra-ui/react';
 import { EmptyState } from '@codiga/codiga-components';
-import { APP_URL } from '../../../renderer/lib/config';
+import { APP_URL } from '../../lib/config';
 
 export default function CookbookTableEmpty() {
   return (
diff --git a/src/renderer/components/CookbookTable/CookbookTableEmptyFiltered.tsx b/src/renderer/components/CookbookTable/CookbookTableEmptyFiltered.tsx
@@ -1,6 +1,6 @@
 import { Button, Flex, Link } from '@chakra-ui/react';
 import { EmptyState } from '@codiga/codiga-components';
-import { APP_URL } from '../../../renderer/lib/config';
+import { APP_URL } from '../../lib/config';
 import { useFilters } from '../FiltersContext';
 
 export default function CookbookTableEmptyFiltereed() {
diff --git a/src/renderer/components/CookbookTable/CookbookTableError.tsx b/src/renderer/components/CookbookTable/CookbookTableError.tsx
@@ -1,6 +1,6 @@
 import { Link } from '@chakra-ui/react';
 import { EmptyState } from '@codiga/codiga-components';
-import { APP_URL } from '../../../renderer/lib/config';
+import { APP_URL } from '../../lib/config';
 
 export default function CookbookTableError() {
   return (
diff --git a/src/renderer/components/Favorite/Favorite.tsx b/src/renderer/components/Favorite/Favorite.tsx
@@ -1,6 +1,6 @@
 import { Button, Tooltip } from '@chakra-ui/react';
 import { HeartFilledIcon, HeartIcon } from '@codiga/codiga-components';
-import { useUser } from '../../../renderer/components/UserContext';
+import { useUser } from '../../components/UserContext';
 
 export type FavoriteProps = {
   isSubscribed?: boolean;
diff --git a/src/renderer/components/Favorite/FavoriteSnippet.tsx b/src/renderer/components/Favorite/FavoriteSnippet.tsx
@@ -3,18 +3,18 @@ import { useToast } from '@codiga/codiga-components';
 import {
   SUBSCRIBE_TO_RECIPE,
   UNSUBSCRIBE_TO_RECIPE,
-} from '../../../renderer/graphql/mutations';
+} from '../../graphql/mutations';
 import {
   GET_RECIPES_SEMANTICALLY,
   GET_SHARED_RECIPES,
   GET_USER_RECIPES,
   GET_USER_SUBSCRIBED_RECIPES,
-} from '../../../renderer/graphql/queries';
+} from '../../graphql/queries';
 import {
   GET_SHARED_RECIPES_VARIABLES,
   GET_USER_RECIPES_VARIABLES,
   GET_USER_SUBSCRIBED_RECIPES_VARIABLES,
-} from '../../../renderer/graphql/variables';
+} from '../../graphql/variables';
 import Favorite, { FavoriteProps } from './Favorite';
 
 type FavoriteRecipeProps = Pick<FavoriteProps, 'isSubscribed'> & {
diff --git a/src/renderer/components/Filters/Filters.tsx b/src/renderer/components/Filters/Filters.tsx
@@ -17,12 +17,12 @@ import {
   LanguageSelector,
   LibrarySelector,
 } from '@codiga/codiga-components';
-import { useFilters } from '../../../renderer/components/FiltersContext';
-import { ALL_LANGUAGES } from '../../../renderer/lib/constants';
+import { useFilters } from '../../components/FiltersContext';
+import { ALL_LANGUAGES } from '../../lib/constants';
 import {
   LanguageEnumeration,
   LibraryEnumeration,
-} from '../../../renderer/types/assistantTypes';
+} from '../../types/assistantTypes';
 
 export default function Filters() {
   const { isOpen, onToggle } = useDisclosure();
diff --git a/src/renderer/components/Filters/filterBy.ts b/src/renderer/components/Filters/filterBy.ts
@@ -1,6 +1,6 @@
-import { FilterTypes } from '../../../renderer/components/FiltersContext';
-import { Language } from '../../../renderer/lib/constants';
-import { AssistantRecipeDependencyConstraint } from '../../../renderer/types/assistantTypes';
+import { FilterTypes } from '../../components/FiltersContext';
+import { Language } from '../../lib/constants';
+import { AssistantRecipeDependencyConstraint } from '../../types/assistantTypes';
 
 const filterByName = (
   filters: FilterTypes,
diff --git a/src/renderer/components/FiltersContext/FiltersContext.tsx b/src/renderer/components/FiltersContext/FiltersContext.tsx
@@ -1,9 +1,9 @@
 import { createContext, useContext, useState, ReactNode } from 'react';
-import { Language } from '../../../renderer/lib/constants';
+import { Language } from '../../lib/constants';
 import {
   LanguageEnumeration,
   LibraryEnumeration,
-} from '../../../renderer/types/assistantTypes';
+} from '../../types/assistantTypes';
 
 export type SearchTermType = string;
 export type LanguageType = LanguageEnumeration;
diff --git a/src/renderer/components/Layout/Layout.tsx b/src/renderer/components/Layout/Layout.tsx
@@ -2,8 +2,8 @@ import { ReactNode, useEffect, useState } from 'react';
 import { useLocation } from 'react-router-dom';
 import { Box, Flex, useDisclosure, useColorMode } from '@chakra-ui/react';
 
-import Login from '../../../renderer/components/Login';
-import { useUser } from '../../../renderer/components/UserContext';
+import Login from '../../components/Login';
+import { useUser } from '../../components/UserContext';
 import SideMenu from './SideMenu';
 import Titlebar from './Titlebar';
 import NotAuthenticated from './NotAuthenticated';
diff --git a/src/renderer/components/Layout/SideMenu.tsx b/src/renderer/components/Layout/SideMenu.tsx
@@ -11,9 +11,9 @@ import {
 } from '@codiga/codiga-components';
 import { useNavigate } from 'react-router-dom';
 
-import { TOKEN } from '../../../renderer/lib/config';
-import { useUser } from '../../../renderer/components/UserContext';
-import { useTheme } from '../../../renderer/components/ThemeContext';
+import { TOKEN } from '../../lib/config';
+import { useUser } from '../../components/UserContext';
+import { useTheme } from '../../components/ThemeContext';
 
 import SideMenuHeader from './SideMenuHeader';
 import { SideMenuItemButton, SideMenuItemLink } from './SideMenuItems';
diff --git a/src/renderer/components/Layout/Titlebar.tsx b/src/renderer/components/Layout/Titlebar.tsx
@@ -2,9 +2,9 @@
 /* eslint-disable jsx-a11y/control-has-associated-label */
 import { Flex, Link, Image } from '@chakra-ui/react';
 import { Avatar } from '@codiga/codiga-components';
-import { useUser } from '../../../renderer/components/UserContext';
-import { APP_URL } from '../../../renderer/lib/config';
-import { getAvatarUrl } from '../../../renderer/utils/userUtils';
+import { useUser } from '../../components/UserContext';
+import { APP_URL } from '../../lib/config';
+import { getAvatarUrl } from '../../utils/userUtils';
 import CodigaLogo from './CodigaIcon.png';
 import TitlebarButton from './TitlebarButton';
 
diff --git a/src/renderer/components/Login/Login.tsx b/src/renderer/components/Login/Login.tsx
@@ -15,9 +15,9 @@ import { TextField, useToast } from '@codiga/codiga-components';
 import { useLazyQuery } from '@apollo/client';
 import { useForm } from 'react-hook-form';
 
-import { APP_URL, TOKEN } from '../../../renderer/lib/config';
-import { CHECK_USER } from '../../../renderer/graphql/queries';
-import { useUser } from '../../../renderer/components/UserContext';
+import { APP_URL, TOKEN } from '../../lib/config';
+import { CHECK_USER } from '../../graphql/queries';
+import { useUser } from '../../components/UserContext';
 
 type LoginProps = {
   isOpen: boolean;
diff --git a/src/renderer/components/SearchResults/SearchResultsCode.tsx b/src/renderer/components/SearchResults/SearchResultsCode.tsx
@@ -17,12 +17,10 @@ import {
   useToast,
 } from '@codiga/codiga-components';
 import { useEffect } from 'react';
-import useCodeView, {
-  CodeViewsType,
-} from '../../../renderer/hooks/useCodeView';
-import { APP_URL } from '../../../renderer/lib/config';
-import { AssistantRecipeWithStats } from '../../../renderer/types/assistantTypes';
-import { decodeIndent } from '../../../renderer/utils/codeUtils';
+import useCodeView, { CodeViewsType } from '../../hooks/useCodeView';
+import { APP_URL } from '../../lib/config';
+import { AssistantRecipeWithStats } from '../../types/assistantTypes';
+import { decodeIndent } from '../../utils/codeUtils';
 import CodeViewToggler from './CodeViewToggler';
 
 type SearchResultsCodeProps = {
diff --git a/src/renderer/components/SearchResults/SearchResultsEmpty.tsx b/src/renderer/components/SearchResults/SearchResultsEmpty.tsx
@@ -1,6 +1,6 @@
 import { Button, Flex, Link } from '@chakra-ui/react';
 import { EmptyState } from '@codiga/codiga-components';
-import { APP_URL } from '../../../renderer/lib/config';
+import { APP_URL } from '../../lib/config';
 import { useFilters } from '../FiltersContext';
 
 export default function SearchResultsEmpty() {
diff --git a/src/renderer/components/SearchResults/SearchResultsError.tsx b/src/renderer/components/SearchResults/SearchResultsError.tsx
@@ -1,6 +1,6 @@
 import { Link } from '@chakra-ui/react';
 import { EmptyState } from '@codiga/codiga-components';
-import { APP_URL } from '../../../renderer/lib/config';
+import { APP_URL } from '../../lib/config';
 
 export default function SearchResultsError() {
   return (
diff --git a/src/renderer/components/SearchResults/SearchResultsListItem.tsx b/src/renderer/components/SearchResults/SearchResultsListItem.tsx
@@ -3,7 +3,7 @@ import { ChartBarsIcon, DotIcon, Logo, Tags } from '@codiga/codiga-components';
 import {
   AssistantRecipeWithStats,
   RecipeSummary,
-} from 'renderer/types/assistantTypes';
+} from '../../types/assistantTypes';
 import FavoriteSnippet from '../Favorite/FavoriteSnippet';
 import Votes from './Votes';
 
diff --git a/src/renderer/components/SearchResults/Votes.tsx b/src/renderer/components/SearchResults/Votes.tsx
@@ -1,15 +1,15 @@
 import { useMutation, useQuery } from '@apollo/client';
 import { Flex, FlexProps, IconButton, Text, Tooltip } from '@chakra-ui/react';
 import { DownVoteIcon, UpVoteIcon, useToast } from '@codiga/codiga-components';
-import { useUser } from '../../../renderer/components/UserContext';
+import { useUser } from '../../components/UserContext';
 import {
   AddVoteMutationVariables,
   ADD_VOTE,
   DeleteVoteMutationVariables,
   DELETE_VOTE,
-} from '../../../renderer/graphql/mutations';
-import { GET_RECIPE_VOTES_QUERY } from '../../../renderer/graphql/queries';
-import { formatNumber } from '../../../renderer/utils/formatUtils';
+} from '../../graphql/mutations';
+import { GET_RECIPE_VOTES_QUERY } from '../../graphql/queries';
+import { formatNumber } from '../../utils/formatUtils';
 
 type VotesProps = FlexProps & {
   entityId: number;
diff --git a/src/renderer/components/SnippetTable/SnippetTable.tsx b/src/renderer/components/SnippetTable/SnippetTable.tsx
@@ -13,12 +13,12 @@ import {
 } from '@chakra-ui/react';
 import { LockIcon, Logo, Avatar, UsersIcon } from '@codiga/codiga-components';
 
-import { getAvatarUrl } from '../../../renderer/utils/userUtils';
-import { getGroupUrl, getSnippetUrl } from '../../../renderer/utils/urlUtils';
-import { AssistantRecipeWithStats } from '../../../renderer/types/assistantTypes';
-import { PageTypes } from '../../../renderer/types/pageTypes';
-import FavoriteSnippet from '../../../renderer/components/Favorite/FavoriteSnippet';
-import UserLink from '../../../renderer/components/UserLink';
+import { getAvatarUrl } from '../../utils/userUtils';
+import { getGroupUrl, getSnippetUrl } from '../../utils/urlUtils';
+import { AssistantRecipeWithStats } from '../../types/assistantTypes';
+import { PageTypes } from '../../types/pageTypes';
+import FavoriteSnippet from '../../components/Favorite/FavoriteSnippet';
+import UserLink from '../../components/UserLink';
 import VotesCurrent from '../VotesCurrent';
 
 const Td = (props: TableCellProps) => (
diff --git a/src/renderer/components/SnippetTable/SnippetTableEmpty.tsx b/src/renderer/components/SnippetTable/SnippetTableEmpty.tsx
@@ -1,6 +1,6 @@
 import { Link } from '@chakra-ui/react';
 import { EmptyState } from '@codiga/codiga-components';
-import { APP_URL } from '../../../renderer/lib/config';
+import { APP_URL } from '../../lib/config';
 
 export default function SnippetTableEmpty() {
   return (
diff --git a/src/renderer/components/SnippetTable/SnippetTableEmptyFiltered.tsx b/src/renderer/components/SnippetTable/SnippetTableEmptyFiltered.tsx
@@ -1,6 +1,6 @@
 import { Button, Flex, Link } from '@chakra-ui/react';
 import { EmptyState } from '@codiga/codiga-components';
-import { APP_URL } from '../../../renderer/lib/config';
+import { APP_URL } from '../../lib/config';
 import { useFilters } from '../FiltersContext';
 
 export default function SnippetTableEmptyFiltered() {
diff --git a/src/renderer/components/SnippetTable/SnippetTableError.tsx b/src/renderer/components/SnippetTable/SnippetTableError.tsx
@@ -1,6 +1,6 @@
 import { Link } from '@chakra-ui/react';
 import { EmptyState } from '@codiga/codiga-components';
-import { APP_URL } from '../../../renderer/lib/config';
+import { APP_URL } from '../../lib/config';
 
 export default function SnippetTableError() {
   return (
diff --git a/src/renderer/components/ThemeContext/ThemeContext.tsx b/src/renderer/components/ThemeContext/ThemeContext.tsx
@@ -2,20 +2,20 @@ import { useContext, createContext, ReactNode, useEffect } from 'react';
 import { useMutation, useQuery } from '@apollo/client';
 import { useColorMode } from '@chakra-ui/react';
 
-import { useUser } from '../../../renderer/components/UserContext';
-import { User } from '../../../renderer/types/userTypes';
-import { GET_USER_PREFERENCES } from '../../../renderer/graphql/queries';
+import { useUser } from '../../components/UserContext';
+import { User } from '../../types/userTypes';
+import { GET_USER_PREFERENCES } from '../../graphql/queries';
 import {
   RemoveUserPreferenceData,
   RemoveUserPreferenceVariables,
   REMOVE_USER_PREFERENCE,
   UpdateUserPreferenceData,
   UpdateUserPreferenceVariables,
   UPDATE_USER_PREFERENCE,
-} from '../../../renderer/graphql/mutations';
-import useLocalStorage from '../../../renderer/hooks/useLocalStorage';
-import { CODIGA_THEME } from '../../../renderer/lib/config';
-import { UserPreferenceKey } from '../../../renderer/lib/constants';
+} from '../../graphql/mutations';
+import useLocalStorage from '../../hooks/useLocalStorage';
+import { CODIGA_THEME } from '../../lib/config';
+import { UserPreferenceKey } from '../../lib/constants';
 import { useToast } from '@codiga/codiga-components';
 
 enum Theme {
diff --git a/src/renderer/components/UserContext/UserContext.tsx b/src/renderer/components/UserContext/UserContext.tsx
@@ -1,8 +1,8 @@
 import { useContext, createContext, ReactNode, useState } from 'react';
 import { useQuery } from '@apollo/client';
-import { CHECK_USER } from '../../../renderer/graphql/queries';
-import { User } from '../../../renderer/types/userTypes';
-import { POLL_USER_FOR_LOGOUT_MSEC } from '../../../renderer/lib/constants';
+import { CHECK_USER } from '../../graphql/queries';
+import { User } from '../../types/userTypes';
+import { POLL_USER_FOR_LOGOUT_MSEC } from '../../lib/constants';
 
 type UserContextType = {
   setUser: React.Dispatch<React.SetStateAction<User>>;
diff --git a/src/renderer/components/UserLink/UserLink.tsx b/src/renderer/components/UserLink/UserLink.tsx
@@ -1,7 +1,7 @@
 import { Link } from '@chakra-ui/react';
 import { ExternalLinkIcon } from '@codiga/codiga-components';
-import { PublicUser } from '../../../renderer/types/userTypes';
-import { getUserUrl } from '../../../renderer/utils/urlUtils';
+import { PublicUser } from '../../types/userTypes';
+import { getUserUrl } from '../../utils/urlUtils';
 
 type UserLinkProps = {
   owner?: PublicUser;
diff --git a/src/renderer/utils/accountUtils.ts b/src/renderer/utils/accountUtils.ts
@@ -1,4 +1,4 @@
-import { AccountType } from '../../renderer/types/userTypes';
+import { AccountType } from '../types/userTypes';
 
 const GithubAvatar = `/topbar/ico-github.png`;
 const GitlabAvatar = `/topbar/ico-gitlab.png`;
diff --git a/src/renderer/utils/publicUserUtils.ts b/src/renderer/utils/publicUserUtils.ts
@@ -2,7 +2,7 @@ import {
   Analysis,
   AnalysisResultSummary,
   Project,
-} from '../../renderer/types/projectTypes';
+} from '../types/projectTypes';
 
 export function getPublicUserProjectsWithScore(ownedProjects?: Project[]) {
   if (!ownedProjects) return [];
diff --git a/src/renderer/utils/urlUtils.ts b/src/renderer/utils/urlUtils.ts
@@ -1,5 +1,5 @@
-import { APP_URL } from '../../renderer/lib/config';
-import { PageTypes } from '../../renderer/types/pageTypes';
+import { APP_URL } from '../lib/config';
+import { PageTypes } from '../types/pageTypes';
 
 export const getCookbookUrl = (
   page: PageTypes,
diff --git a/src/renderer/utils/userUtils.ts b/src/renderer/utils/userUtils.ts
@@ -1,6 +1,6 @@
-import { API_ROOT_URL } from '../../renderer/lib/config';
-import { PublicUser, User } from '../../renderer/types/userTypes';
-import { UserPreferenceKey } from '../../renderer/lib/constants';
+import { API_ROOT_URL } from '../lib/config';
+import { PublicUser, User } from '../types/userTypes';
+import { UserPreferenceKey } from '../lib/constants';
 
 export const isGravatarEnabledForUser = (user: User) => {
   return (
