Skip to content

Commit df6752e

Browse files
alexjenningsalexjennings
authored
Merge pull request #29 from vidispine/24.4.0
24.4.0
2 parents ce9aeed + a22b221 commit df6752e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+2213
-1772
lines changed

‎.github/workflows/gh-pages.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
path: |
1919
node_modules
2020
*/*/node_modules
21-
key: ${{ runner.os }}-${{ hashFiles('**/package-log.json') }}
21+
key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
2222
- name: Install dependencies
2323
if: steps.cache-modules.outputs.cache-hit != 'true'
2424
run: npm install

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vidispine/admin-tool",
3-
"version": "24.3.1",
3+
"version": "24.4.0",
44
"private": true,
55
"dependencies": {
66
"@devbookhq/splitter": "^1.3.2",

‎src/components/file/FileTitle.jsx‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@ function FileTitle({
4040
return (
4141
<TitleHeader
4242
helpTo="/ref/storage/file.html"
43-
breadcrumbList={[{ title: 'File', to: routes.fileList() }, { title: fileId, to: routes.file({ fileId }) }, ...breadcrumbList]}
43+
breadcrumbList={[
44+
{ title: 'File', to: routes.fileList() },
45+
{ title: fileId, to: routes.file({ fileId }) },
46+
...breadcrumbList,
47+
]}
4448
iconList={(
4549
<>
4650
{fileDocument && (
@@ -52,37 +56,43 @@ function FileTitle({
5256
<Typography color="inherit">Change State</Typography>
5357
</MenuItem>
5458
<MenuItem onClick={() => onOpen({ modalName: uriModal })}>
55-
<Typography color="inherit">Generate Temporary URI</Typography>
59+
<Typography color="inherit">
60+
Generate Temporary URI
61+
</Typography>
5662
</MenuItem>
57-
<UnstyledLink to={`/import?tab=IMPORTFILE_TAB&fileId=${fileId}`}>
63+
<UnstyledLink to={`/import/file/?fileId=${fileId}`}>
5864
<MenuItem>
5965
<Typography color="inherit">Import As Item</Typography>
6066
</MenuItem>
6167
</UnstyledLink>
6268
<MenuItem>
63-
<UnstyledLink to={`/import?tab=IMPORTSHAPE_TAB&fileId=${fileId}`}>
69+
<UnstyledLink to={`/import/item/shape/?fileId=${fileId}`}>
6470
<Typography>Import As Shape</Typography>
6571
</UnstyledLink>
6672
</MenuItem>
67-
<UnstyledLink to={`/import?tab=IMPORTCOMPONENT_TAB&fileId=${fileId}`}>
73+
<UnstyledLink to={`/import/item/component/?fileId=${fileId}`}>
6874
<MenuItem>
6975
<Typography color="inherit">Import To Component</Typography>
7076
</MenuItem>
7177
</UnstyledLink>
72-
<UnstyledLink to={`/import?tab=IMPORTSIDECAR_TAB&fileId=${fileId}`}>
78+
<UnstyledLink to={`/import/sidecar/?fileId=${fileId}`}>
7379
<MenuItem>
7480
<Typography color="inherit">Import As Sidecar</Typography>
7581
</MenuItem>
7682
</UnstyledLink>
77-
<UnstyledLink to={`/import-imp/?tab=IMPORTIMP_FILE_TAB&fileId=${fileId}`}>
83+
<UnstyledLink
84+
to={`/import-imp/?tab=IMPORTIMP_FILE_TAB&fileId=${fileId}`}
85+
>
7886
<MenuItem>
7987
<Typography color="inherit">Import As IMP</Typography>
8088
</MenuItem>
8189
</UnstyledLink>
8290
<MenuItem onClick={() => onOpen({ modalName: analyzeModal })}>
8391
<Typography color="inherit">Shape Deduction</Typography>
8492
</MenuItem>
85-
<MenuItem onClick={() => onOpen({ modalName: impAnalyzeModal })}>
93+
<MenuItem
94+
onClick={() => onOpen({ modalName: impAnalyzeModal })}
95+
>
8696
<Typography color="inherit">IMP Deduction</Typography>
8797
</MenuItem>
8898
<MenuItem onClick={() => onOpen({ modalName: moveModal })}>
@@ -102,7 +112,9 @@ function FileTitle({
102112
abandonModal={abandonModal}
103113
onOpen={onOpen}
104114
/>
105-
<MenuItem onClick={() => onOpen({ modalName: removeEntityModal })}>
115+
<MenuItem
116+
onClick={() => onOpen({ modalName: removeEntityModal })}
117+
>
106118
<Typography color="secondary">Remove Entity</Typography>
107119
</MenuItem>
108120
<MenuItem onClick={() => onOpen({ modalName: deleteModal })}>
@@ -111,7 +123,6 @@ function FileTitle({
111123
</Menu>
112124
</>
113125
)}
114-
115126
</>
116127
)}
117128
{...props}

‎src/components/import/ImportCollectionWizard.jsx‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,11 @@ function ImportCollectionWizard({
4242
<TitleHeader
4343
parentTitle="Import"
4444
title="Collection"
45-
style={{ paddingTop: 10, paddingBottom: 10 }}
46-
actionComponent={(
47-
<Button
48-
color="primary"
49-
variant="text"
50-
size="large"
51-
onClick={() => submitForm(EDIT_COLLECTION_FORM)}
52-
>
53-
Create
54-
</Button>
55-
)}
45+
helpTo="/ref/collection.html#create-a-collection"
5646
/>
5747
<Stepper activeStep={activeStep} orientation="vertical">
5848
<Step>
59-
<StepLabel>Collection</StepLabel>
49+
<StepLabel>Params</StepLabel>
6050
<StepContent>
6151
<SquareCard>
6252
<CardContent>
@@ -69,19 +59,23 @@ function ImportCollectionWizard({
6959
/>
7060
</CardContent>
7161
<AccordionActions>
62+
<Button variant="text" color="primary" onClick={onNext}>
63+
Edit Collection Document
64+
</Button>
7265
<Button
73-
variant="text"
7466
color="primary"
75-
onClick={onNext}
67+
variant="contained"
68+
size="large"
69+
onClick={() => submitForm(EDIT_COLLECTION_FORM)}
7670
>
77-
Next
71+
Create
7872
</Button>
7973
</AccordionActions>
8074
</SquareCard>
8175
</StepContent>
8276
</Step>
8377
<Step>
84-
<StepLabel>Document</StepLabel>
78+
<StepLabel>Collection Document</StepLabel>
8579
<StepContent>
8680
<SquareCard>
8781
<CardContent>
@@ -94,8 +88,14 @@ function ImportCollectionWizard({
9488
/>
9589
</CardContent>
9690
<AccordionActions>
97-
<Button onClick={onBack}>
98-
Back
91+
<Button onClick={onBack}>Back</Button>
92+
<Button
93+
color="primary"
94+
variant="contained"
95+
size="large"
96+
onClick={() => submitForm(EDIT_COLLECTION_FORM)}
97+
>
98+
Create
9999
</Button>
100100
</AccordionActions>
101101
</SquareCard>

‎src/components/import/ImportComponentAdvancedForm.jsx‎

Lines changed: 0 additions & 170 deletions
This file was deleted.

0 commit comments

Comments
 (0)