From 742beda31902824f39d866abec520885d0deaef6 Mon Sep 17 00:00:00 2001 From: calvin Date: Fri, 2 Jun 2023 14:34:06 -0600 Subject: [PATCH] fix: [code-421]: fix image carousel and yarn checks --- web/src/components/MarkdownViewer/MarkdownViewer.tsx | 8 ++++---- .../ResourceListingPagination.tsx | 2 +- web/src/pages/PullRequests/PullRequests.tsx | 2 +- web/src/pages/RepositoriesListing/RepositoriesListing.tsx | 2 +- .../RepositoryContent/FileContent/FileContent.tsx | 4 ++-- .../Repository/RepositoryContent/FolderContent/Readme.tsx | 2 +- .../RepositoryBranchesContent.tsx | 2 +- web/src/pages/RepositoryCommits/RepositoryCommits.tsx | 2 +- .../RepositoryTagsContent/RepositoryTagsContent.tsx | 5 ++--- web/src/pages/RepositoryTags/TagsContent/TagsContent.tsx | 4 ++-- web/src/pages/Webhooks/Webhooks.tsx | 2 +- 11 files changed, 17 insertions(+), 18 deletions(-) diff --git a/web/src/components/MarkdownViewer/MarkdownViewer.tsx b/web/src/components/MarkdownViewer/MarkdownViewer.tsx index 36409b484..17e0f8bf0 100644 --- a/web/src/components/MarkdownViewer/MarkdownViewer.tsx +++ b/web/src/components/MarkdownViewer/MarkdownViewer.tsx @@ -24,11 +24,11 @@ export function MarkdownViewer({ source, className, maxHeight }: MarkdownViewerP const interceptClickEventOnViewerContainer = useCallback( event => { const { target } = event - - const imageArray = source.split('\n').filter(string => string.includes('![image]')) + const imgPattern = /!\[.*?\]\((.*?)\)/; + const imageArray = source.split('\n').filter(string => imgPattern.test(string)) const imageStringArray = imageArray.map(string => { - const imageSrc = string.split('![image]')[1] - return imageSrc.slice(1, imageSrc.length - 1) + const match = string.match(imgPattern); + return match ? match[1] : ''; }) setImageEvent(imageStringArray) diff --git a/web/src/components/ResourceListingPagination/ResourceListingPagination.tsx b/web/src/components/ResourceListingPagination/ResourceListingPagination.tsx index 2fe03298f..9225f41ea 100644 --- a/web/src/components/ResourceListingPagination/ResourceListingPagination.tsx +++ b/web/src/components/ResourceListingPagination/ResourceListingPagination.tsx @@ -40,7 +40,7 @@ export const ResourceListingPagination: React.FC setPage(_page) updateQueryParams({ page: _page.toString() }) }, - [setPage, scrollTop] + [setPage, scrollTop] // eslint-disable-line react-hooks/exhaustive-deps ) return totalItems ? ( diff --git a/web/src/pages/PullRequests/PullRequests.tsx b/web/src/pages/PullRequests/PullRequests.tsx index 7f9f48b28..15d02082d 100644 --- a/web/src/pages/PullRequests/PullRequests.tsx +++ b/web/src/pages/PullRequests/PullRequests.tsx @@ -54,7 +54,7 @@ export default function PullRequests() { useEffect(() => { updateQueryParams({ page: page.toString() }) - }, [setPage]) + }, [setPage]) // eslint-disable-line react-hooks/exhaustive-deps const { repoMetadata, error, loading, refetch } = useGetRepositoryMetadata() const { diff --git a/web/src/pages/RepositoriesListing/RepositoriesListing.tsx b/web/src/pages/RepositoriesListing/RepositoriesListing.tsx index ef9923b66..11e1b2420 100644 --- a/web/src/pages/RepositoriesListing/RepositoriesListing.tsx +++ b/web/src/pages/RepositoriesListing/RepositoriesListing.tsx @@ -60,7 +60,7 @@ export default function RepositoriesListing() { useEffect(() => { setSearchTerm(undefined) updateQueryParams({ page: page.toString() }) - }, [space, setPage]) + }, [space, setPage]) // eslint-disable-line react-hooks/exhaustive-deps const columns: Column[] = useMemo( () => [ diff --git a/web/src/pages/Repository/RepositoryContent/FileContent/FileContent.tsx b/web/src/pages/Repository/RepositoryContent/FileContent/FileContent.tsx index ae5090d43..6a6a6b898 100644 --- a/web/src/pages/Repository/RepositoryContent/FileContent/FileContent.tsx +++ b/web/src/pages/Repository/RepositoryContent/FileContent/FileContent.tsx @@ -29,10 +29,10 @@ import { useCommitModal } from 'components/CommitModalButton/CommitModalButton' import { useStrings } from 'framework/strings' import { OptionsMenuButton } from 'components/OptionsMenuButton/OptionsMenuButton' import { PlainButton } from 'components/PlainButton/PlainButton' +import { useGetSpaceParam } from 'hooks/useGetSpaceParam' import { Readme } from '../FolderContent/Readme' import { GitBlame } from './GitBlame' import css from './FileContent.module.scss' -import { useGetSpaceParam } from 'hooks/useGetSpaceParam' enum FileSection { CONTENT = 'content', @@ -104,7 +104,7 @@ export function FileContent({ return { disabled: perms.disabled, tooltip: perms.tooltip } } return { disabled: isRefATag(gitRef) || false, tooltip: undefined } - }, [permPushResult, gitRef]) + }, [permPushResult, gitRef]) // eslint-disable-line react-hooks/exhaustive-deps return ( diff --git a/web/src/pages/Repository/RepositoryContent/FolderContent/Readme.tsx b/web/src/pages/Repository/RepositoryContent/FolderContent/Readme.tsx index 9b8c089c8..aeac045cc 100644 --- a/web/src/pages/Repository/RepositoryContent/FolderContent/Readme.tsx +++ b/web/src/pages/Repository/RepositoryContent/FolderContent/Readme.tsx @@ -64,7 +64,7 @@ function ReadmeViewer({ metadata, gitRef, readmeInfo, contentOnly, maxWidth }: F return { disabled: perms.disabled, tooltip: perms.tooltip } } return { disabled: (gitRef && isRefATag(gitRef)) || false, tooltip: undefined } - }, [permPushResult, gitRef]) + }, [permPushResult, gitRef]) // eslint-disable-line react-hooks/exhaustive-deps return ( { updateQueryParams({ page: page.toString() }) - }, [setPage]) + }, [setPage]) // eslint-disable-line react-hooks/exhaustive-deps useShowRequestError(error) diff --git a/web/src/pages/RepositoryCommits/RepositoryCommits.tsx b/web/src/pages/RepositoryCommits/RepositoryCommits.tsx index c6191a412..eabe2ac66 100644 --- a/web/src/pages/RepositoryCommits/RepositoryCommits.tsx +++ b/web/src/pages/RepositoryCommits/RepositoryCommits.tsx @@ -44,7 +44,7 @@ export default function RepositoryCommits() { useEffect(() => { updateQueryParams({ page: page.toString() }) - }, [setPage]) + }, [setPage]) // eslint-disable-line react-hooks/exhaustive-deps return ( diff --git a/web/src/pages/RepositoryTags/RepositoryTagsContent/RepositoryTagsContent.tsx b/web/src/pages/RepositoryTags/RepositoryTagsContent/RepositoryTagsContent.tsx index ea14cf588..8c7cce1df 100644 --- a/web/src/pages/RepositoryTags/RepositoryTagsContent/RepositoryTagsContent.tsx +++ b/web/src/pages/RepositoryTags/RepositoryTagsContent/RepositoryTagsContent.tsx @@ -2,10 +2,9 @@ import React, { useEffect, useState } from 'react' import { Container } from '@harness/uicore' import { useGet } from 'restful-react' import { useHistory } from 'react-router-dom' -import { noop } from 'lodash-es' import type { RepoCommitTag } from 'services/code' import { usePageIndex } from 'hooks/usePageIndex' -import { LIST_FETCHING_LIMIT, permissionProps, voidFn,PageBrowserProps } from 'utils/Utils' +import { LIST_FETCHING_LIMIT, permissionProps,PageBrowserProps } from 'utils/Utils' import { useQueryParams } from 'hooks/useQueryParams' import { useUpdateQueryParams } from 'hooks/useUpdateQueryParams' import { useAppContext } from 'AppContext' @@ -51,7 +50,7 @@ export function RepositoryTagsContent({ repoMetadata }: Pick { updateQueryParams({ page: page.toString() }) - }, [setPage]) + }, [setPage]) // eslint-disable-line react-hooks/exhaustive-deps useShowRequestError(error) const space = useGetSpaceParam() diff --git a/web/src/pages/RepositoryTags/TagsContent/TagsContent.tsx b/web/src/pages/RepositoryTags/TagsContent/TagsContent.tsx index d28cabaea..588f69c1e 100644 --- a/web/src/pages/RepositoryTags/TagsContent/TagsContent.tsx +++ b/web/src/pages/RepositoryTags/TagsContent/TagsContent.tsx @@ -201,7 +201,7 @@ export function TagsContent({ repoMetadata, searchTerm = '', branches, onDeleteS } } ], - [ + [ // eslint-disable-line react-hooks/exhaustive-deps getString, repoMetadata.default_branch, repoMetadata.path, @@ -210,7 +210,7 @@ export function TagsContent({ repoMetadata, searchTerm = '', branches, onDeleteS history, onDeleteSuccess, divergence - ] + ] // eslint-disable-line react-hooks/exhaustive-deps ) return ( diff --git a/web/src/pages/Webhooks/Webhooks.tsx b/web/src/pages/Webhooks/Webhooks.tsx index ce0f934d0..b040be2db 100644 --- a/web/src/pages/Webhooks/Webhooks.tsx +++ b/web/src/pages/Webhooks/Webhooks.tsx @@ -70,7 +70,7 @@ export default function Webhooks() { }) useEffect(() => { updateQueryParams({ page: page.toString() }) - }, [setPage]) + }, [setPage]) // eslint-disable-line react-hooks/exhaustive-deps const columns: Column[] = useMemo( () => [