From 37286e478d8430ce4d2650764fa784320956836b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Ctan-nhu=E2=80=9D?= <“tan@harness.io”> Date: Tue, 27 Jun 2023 12:55:04 -0700 Subject: [PATCH] [CODE-570]: [UI] Unable to Edit files + add extra text file types --- .../FileContent/FileContent.tsx | 5 ++--- web/src/utils/FileUtils.ts | 20 +++++++++++++++---- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/web/src/pages/Repository/RepositoryContent/FileContent/FileContent.tsx b/web/src/pages/Repository/RepositoryContent/FileContent/FileContent.tsx index d214b88c0..9a9653d92 100644 --- a/web/src/pages/Repository/RepositoryContent/FileContent/FileContent.tsx +++ b/web/src/pages/Repository/RepositoryContent/FileContent/FileContent.tsx @@ -53,7 +53,7 @@ export function FileContent({ const { routes } = useAppContext() const { getString } = useStrings() const downloadFile = useDownloadRawFile() - const { category, isFileTooLarge, isViewable, filename, extension, size, base64Data, rawURL } = + const { category, isText, isFileTooLarge, isViewable, filename, extension, size, base64Data, rawURL } = useFileContentViewerDecision({ repoMetadata, gitRef, resourcePath, resourceContent }) const history = useHistory() const [activeTab, setActiveTab] = React.useState(FileSection.CONTENT) @@ -91,7 +91,6 @@ export function FileContent({ const { standalone } = useAppContext() const { hooks } = useAppContext() const space = useGetSpaceParam() - const isATextFile = category === FileCategory.TEXT const permPushResult = hooks?.usePermissionTranslate?.( { resource: { @@ -177,7 +176,7 @@ export function FileContent({ icon="code-edit" tooltipProps={{ isDark: true }} tooltip={permsFinal.tooltip} - disabled={permsFinal.disabled || !isATextFile} + disabled={permsFinal.disabled || !isText} onClick={() => { history.push( routes.toCODEFileEdit({ diff --git a/web/src/utils/FileUtils.ts b/web/src/utils/FileUtils.ts index 7a754af8b..195066d51 100644 --- a/web/src/utils/FileUtils.ts +++ b/web/src/utils/FileUtils.ts @@ -60,14 +60,12 @@ export function useFileContentViewerDecision({ const isFileTooLarge = resourceData?.size !== resourceData?.data_size const rawURL = `/code/api/v1/repos/${repoMetadata?.path}/+/raw/${resourcePath}?routingId=${routingId}&git_ref=${gitRef}` - // TODO: TEST ONLY - // const rawURL = `https://localhost:8181/rawfile/${filename}` - return { category, isFileTooLarge, isViewable, + isText, filename, extension, @@ -439,7 +437,21 @@ const TextExtensions = [ 'yml', 'zsh', 'zshrc', - 'ics' + 'ics', + + 'rego', + 'tf', + 'hcl', + 'mod', + 'sum', + 'rst', + 'toml', + 'abap', + 'uos', + 'uot', + 'ahk', + 'asciidoc', + 'slk' ] const SpecialTextFiles = [