Skip to content

Commit

Permalink
Merge pull request #300 from performant-software/feature/cdc308_media…
Browse files Browse the repository at this point in the history
…_upload_error

CDC #308 - Media Upload Error
  • Loading branch information
dleadbetter authored Oct 3, 2024
2 parents d0809b3 + 55cefa4 commit a288298
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 17 deletions.
6 changes: 3 additions & 3 deletions packages/controlled-vocabulary/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@performant-software/controlled-vocabulary",
"version": "2.2.14",
"version": "2.2.15",
"description": "A package of components to allow user to configure dropdown elements. Use with the \"controlled_vocabulary\" gem.",
"license": "MIT",
"main": "./dist/index.cjs.js",
Expand All @@ -23,8 +23,8 @@
"underscore": "^1.13.2"
},
"peerDependencies": {
"@performant-software/semantic-components": "^2.2.14",
"@performant-software/shared-components": "^2.2.14",
"@performant-software/semantic-components": "^2.2.15",
"@performant-software/shared-components": "^2.2.15",
"react": ">= 16.13.1 < 19.0.0",
"react-dom": ">= 16.13.1 < 19.0.0"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/core-data/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@performant-software/core-data",
"version": "2.2.14",
"version": "2.2.15",
"description": "A package of components used with the Core Data platform.",
"license": "MIT",
"main": "./dist/index.cjs.js",
Expand Down Expand Up @@ -40,8 +40,8 @@
"underscore": "^1.13.2"
},
"peerDependencies": {
"@performant-software/geospatial": "^2.2.14",
"@performant-software/shared-components": "^2.2.14",
"@performant-software/geospatial": "^2.2.15",
"@performant-software/shared-components": "^2.2.15",
"@peripleo/maplibre": "^0.5.2",
"@peripleo/peripleo": "^0.5.2",
"react": ">= 16.13.1 < 19.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/geospatial/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@performant-software/geospatial",
"version": "2.2.14",
"version": "2.2.15",
"description": "A package of components for all things map-related.",
"license": "MIT",
"main": "./dist/index.cjs.js",
Expand Down
4 changes: 2 additions & 2 deletions packages/semantic-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@performant-software/semantic-components",
"version": "2.2.14",
"version": "2.2.15",
"description": "A package of shared components based on the Semantic UI Framework.",
"license": "MIT",
"main": "./dist/index.cjs.js",
Expand Down Expand Up @@ -35,7 +35,7 @@
"zotero-translation-client": "^5.0.1"
},
"peerDependencies": {
"@performant-software/shared-components": "^2.2.14",
"@performant-software/shared-components": "^2.2.15",
"@samvera/clover-iiif": "^2.3.2",
"react": ">= 16.13.1 < 19.0.0",
"react-dnd": "^11.1.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/semantic-ui/src/components/FileUploadModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ const FileUploadModal: ComponentType<any> = (props: Props) => {
</Message.List>
</Message>
)}
{ props.errors && (
{ !_.isEmpty(props.errors) && (
<Message
error
>
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@performant-software/shared-components",
"version": "2.2.14",
"version": "2.2.15",
"description": "A package of shared, framework agnostic, components.",
"license": "MIT",
"main": "./dist/index.cjs.js",
Expand Down
24 changes: 23 additions & 1 deletion packages/storybook/src/semantic-ui/FileUploadModal.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export const Default = withWrapper((props) => (
/>
));

export const Errors = withWrapper((props) => (
export const InputErrors = withWrapper((props) => (
<FileUploadModal
closeOnComplete={false}
itemComponent={({
Expand Down Expand Up @@ -98,6 +98,28 @@ export const Errors = withWrapper((props) => (
/>
));

export const UploadErrors = withWrapper((props) => (
<FileUploadModal
errors={['File too large.']}
itemComponent={({ item }) => (
<Form.Input
label='Name'
value={item.name || ''}
/>
)}
onAddFile={(file) => ({
name: file.name,
content: file,
type: file.type
})}
onClose={props.onClose}
onSave={() => {
action('save')();
return Promise.resolve();
}}
/>
));

export const Images = withWrapper((props) => (
<FileUploadModal
itemComponent={({ item, onTextInputChange }) => (
Expand Down
6 changes: 3 additions & 3 deletions packages/user-defined-fields/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@performant-software/user-defined-fields",
"version": "2.2.14",
"version": "2.2.15",
"description": "A package of components used for allowing end users to define fields on models. Use with the \"user_defined_fields\" gem.",
"license": "MIT",
"main": "./dist/index.cjs.js",
Expand All @@ -23,8 +23,8 @@
"underscore": "^1.13.2"
},
"peerDependencies": {
"@performant-software/semantic-components": "^2.2.14",
"@performant-software/shared-components": "^2.2.14",
"@performant-software/semantic-components": "^2.2.15",
"@performant-software/shared-components": "^2.2.15",
"react": ">= 16.13.1 < 19.0.0",
"react-dom": ">= 16.13.1 < 19.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/visualize/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@performant-software/visualize",
"version": "2.2.14",
"version": "2.2.15",
"description": "A package of components used for data visualization",
"license": "MIT",
"main": "./dist/index.cjs.js",
Expand Down
2 changes: 1 addition & 1 deletion react-components.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
"packages/user-defined-fields",
"packages/visualize"
],
"version": "2.2.14"
"version": "2.2.15"
}

0 comments on commit a288298

Please sign in to comment.