Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Edit file and add to package #3070

Merged
merged 5 commits into from
Sep 12, 2022
Merged

Edit file and add to package #3070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
907eb61
add button link to edit file and add to package
fiskus Sep 5, 2022
190ecf8
Merge branch 'master' of github.com:quiltdata/quilt into edit-package…
fiskus Sep 12, 2022
d5c5285
fix react key
fiskus Sep 12, 2022
cc967d9
add changelog entry
fiskus Sep 12, 2022
79be411
Merge branch 'master' into edit-package-file
fiskus Sep 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion catalog/app/containers/Bucket/PackageTree/PackageTree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { basename } from 'path'
import { basename, join } from 'path'

import dedent from 'dedent'
import * as R from 'ramda'
Expand All @@ -10,6 +10,7 @@ import * as M from '@material-ui/core'
import * as Lab from '@material-ui/lab'

import { Crumb, copyWithoutSpaces, render as renderCrumbs } from 'components/BreadCrumbs'
import { detect } from 'components/FileEditor/loader'
import Message from 'components/Message'
import Placeholder from 'components/Placeholder'
import * as Preview from 'components/Preview'
Expand Down Expand Up @@ -558,6 +559,17 @@ function FileDisplay({
[bucket, history, name, path, hashOrTag, urls],
)

const isEditable = detect(path) && hashOrTag === 'latest'
const handleEdit = React.useCallback(() => {
const next = urls.bucketPackageDetail(bucket, name, { action: 'revisePackage' })
const editUrl = urls.bucketFile(bucket, join(name, path), {
add: true,
edit: true,
next,
})
history.push(editUrl)
}, [bucket, history, name, path, urls])

const renderProgress = () => (
// TODO: skeleton placeholder
<>
Expand Down Expand Up @@ -628,6 +640,14 @@ function FileDisplay({
lastModified={lastModified}
size={size}
/>
{isEditable && (
<FileView.AdaptiveButtonLayout
className={classes.button}
icon="edit"
label="Edit"
onClick={handleEdit}
/>
)}
{!!viewModes.modes.length && (
<FileView.ViewModeSelector
className={classes.button}
Expand Down
4 changes: 3 additions & 1 deletion catalog/app/containers/Bucket/Summary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@ function SplitButton({ onClick, children, onChange, options }) {
</M.ButtonGroup>
<M.Menu open={!!anchorEl} anchorEl={anchorEl} onClose={() => setAnchorEl(null)}>
{options.map((option, i) => (
<M.MenuItem onClick={handleSelect(i)}>{option}</M.MenuItem>
<M.MenuItem key={`${option}_${i}`} onClick={handleSelect(i)}>
{option}
</M.MenuItem>
))}
</M.Menu>
</>
Expand Down
1 change: 1 addition & 0 deletions docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
* [Added] Redirect to last selected Athena workgroup ([#3067](https://github.com/quiltdata/quilt/pull/3067))
* [Added] `status_reports` lambda ([#2989](https://github.com/quiltdata/quilt/pull/2989))
* [Added] Stack Status Admin UI: reports ([#3068](https://github.com/quiltdata/quilt/pull/3068))
* [Added] Edit button for text files in packages ([#3070](https://github.com/quiltdata/quilt/pull/3070))
* [Fixed] Fix package creation in S3 buckets with SSE-KMS enabled ([#2754](https://github.com/quiltdata/quilt/pull/2754))
* [Fixed] Fix creation of packages with large (4+ GiB) files ([#2933](https://github.com/quiltdata/quilt/pull/2933))
* [Fixed] Fix pre-popullation of default dates when using "dateformat" + {"format": "date"} ([3082](https://github.com/quiltdata/quilt/pull/3082))
Expand Down