Skip to content

Commit f17ff79

Browse files
committed
Solve issues with progress modal.
1 parent a5e8849 commit f17ff79

File tree

3 files changed

+37
-15
lines changed

3 files changed

+37
-15
lines changed

src/scss/_custom.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,11 @@
7878
margin-bottom: 5px;
7979
right: 0;
8080
font-size: small;
81+
max-width: 25vw;
82+
}
83+
84+
.progress-modal-body {
85+
max-height: 30vh;
8186
}
8287

8388
.task-modal {
@@ -127,3 +132,4 @@
127132
-webkit-transform: rotate(270deg) translateX(-100%);
128133
-ms-transform: rotate(270deg) translateX(-100%);
129134
}
135+

src/utils/API/endpoint.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ const urls = {
66
/**
77
* Purge a directory.
88
*/
9-
purge: "/operations/purge",
9+
purge: "operations/purge",
1010
/**
1111
* Delete a file.
1212
*/
13-
deleteFile: "/operations/deletefile",
13+
deleteFile: "operations/deletefile",
1414
/**
1515
* Create public link.
1616
*/
@@ -26,19 +26,19 @@ const urls = {
2626
/**
2727
* Move a directory.
2828
*/
29-
moveDir: "/sync/move",
29+
moveDir: "sync/move",
3030
/**
3131
* Move a file.
3232
*/
33-
moveFile: "/operations/movefile",
33+
moveFile: "operations/movefile",
3434
/**
3535
* Copy Directory
3636
*/
37-
copyDir: "/sync/copy",
37+
copyDir: "sync/copy",
3838
/**
3939
* Copy Files.
4040
*/
41-
copyFile: "/operations/copyfile",
41+
copyFile: "operations/copyfile",
4242
/**
4343
* Cleanup the remote recycle bin(trash).
4444
*/
@@ -64,11 +64,11 @@ const urls = {
6464
/**
6565
* Get providers configuration in the rclone backend.
6666
*/
67-
getProviders: "/config/providers",
67+
getProviders: "config/providers",
6868
/**
6969
* Get entire remote configuration dump from backend.
7070
*/
71-
getConfigDump: "/config/dump",
71+
getConfigDump: "config/dump",
7272
/**
7373
* List the currently running jobs.
7474
*/
@@ -84,7 +84,7 @@ const urls = {
8484
/**
8585
* Create a new config with parameters.
8686
*/
87-
createConfig: "/config/create",
87+
createConfig: "config/create",
8888
/**
8989
* Update an existing config with parameters.
9090
*/
@@ -110,7 +110,7 @@ const urls = {
110110
/**
111111
* Delete a config with config name.
112112
*/
113-
deleteConfig: "/config/delete"
113+
deleteConfig: "config/delete"
114114

115115
};
116116
export default urls;

src/views/Base/RunningJobs/RunningJobs.js

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,28 @@ function JobCard({job}) {
4646
return null;
4747
}
4848

49+
function getCroppedName(name) {
50+
const leftChars = 30;
51+
const rightChars = 5;
52+
53+
if (name.length > leftChars) {
54+
const croppedName = name.substr(0, leftChars) + " ... " + name.substr(-rightChars);
55+
return croppedName;
56+
}
57+
return name;
58+
59+
}
60+
4961
function JobCardRow({job}) {
5062
const {name, percentage, speed, size} = job;
5163
return (
5264
<React.Fragment>
53-
<Row>
54-
{(size && speed) ? (<Col lg={12}>{name}({formatBytes(size)}) - {formatBytes(speed)}PS </Col>) : (
65+
<Row className="runningJobs">
66+
{(size && speed) ? (
67+
68+
<Col lg={12} className="itemName"> {getCroppedName(name)} {" "}
69+
({formatBytes(size)}) - {formatBytes(speed)}PS </Col>
70+
) : (
5571
<Col lg={12}>Calculating</Col>)}
5672

5773
</Row>
@@ -113,7 +129,7 @@ function GlobalStatus({stats}) {
113129
function TransferringJobs({transferring}) {
114130
if (transferring !== undefined) {
115131
return transferring.map((item, idx) => {
116-
return (<JobCard key={idx} job={item}/>);
132+
return (<JobCard key={item.name} job={item}/>);
117133
});
118134
}
119135
return null;
@@ -122,7 +138,7 @@ function TransferringJobs({transferring}) {
122138
function TransferringJobsRow({transferring}) {
123139
if (transferring !== undefined) {
124140
return transferring.map((item, idx) => {
125-
return (<JobCardRow key={idx} job={item}/>);
141+
return (<JobCardRow key={item.name} job={item}/>);
126142
});
127143
}
128144
return null;
@@ -202,7 +218,7 @@ class RunningJobs extends React.Component {
202218
</Button>
203219
</div>
204220
</CardHeader>
205-
<CardBody className={!this.state.isShowing ? "d-none" : ""}>
221+
<CardBody className={!this.state.isShowing ? "d-none" : "progress-modal-body"}>
206222
<TransferringJobsRow transferring={transferring}/>
207223

208224
</CardBody>

0 commit comments

Comments
 (0)