Skip to content

Commit 9698ff4

Browse files
Fix lint error and update files after merging feat/react-dashboard
1 parent ae7e243 commit 9698ff4

File tree

7 files changed

+47
-38
lines changed

7 files changed

+47
-38
lines changed

client/modules/datafiles/src/publications/modals/DownloadDatasetModal.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ export const DownloadDatasetModal: React.FC<{
241241
archivePath,
242242
isModalOpen
243243
);
244-
const FILE_SIZE_LIMIT = 2147483648;
244+
const FILE_SIZE_LIMIT = 5368709120; // 5 GB
245245
const exceedsLimit = useMemo(
246246
() => (data?.length ?? 0) > FILE_SIZE_LIMIT,
247247
[data?.length]
@@ -275,7 +275,7 @@ export const DownloadDatasetModal: React.FC<{
275275
{exceedsLimit ? (
276276
<p>
277277
This project zipped is <strong>{toBytes(data.length)}</strong>,
278-
exceeding the <strong>2 GB</strong> download limit. To download,
278+
exceeding the <strong>5 GB</strong> download limit. To download,
279279
<a
280280
href="https://accounts.tacc.utexas.edu/register"
281281
target="_blank"
@@ -294,8 +294,8 @@ export const DownloadDatasetModal: React.FC<{
294294
{' '}
295295
Data Transfer Guide
296296
</a>
297-
. Alternatively, download files individually by selecting the
298-
file and using the download button in the toolbar.
297+
. Alternatively, download subsets of files or individually by
298+
selecting the file and using the download button in the toolbar.
299299
</p>
300300
) : (
301301
<p>

client/modules/workspace/src/components/SystemStatusModal/SystemStatusModal.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,17 @@ const SystemStatusContent: React.FC<SystemStatusModalProps> = ({
4646
}, [app, appId, executionSystems]);
4747

4848
const { data: systems, isLoading, error } = useSystemOverview();
49+
const availableSystems = systems?.map((sys) => sys.display_name) || [];
4950
const selectedSystem = systems?.find(
5051
(sys) => sys.display_name === activeSystem
5152
);
5253

54+
useEffect(() => {
55+
if (systems && !availableSystems.includes(activeSystem)) {
56+
setActiveSystem('Vista');
57+
}
58+
}, [systems, activeSystem]);
59+
5360
return (
5461
<Modal
5562
title="System Status"
@@ -111,7 +118,7 @@ const SystemStatusContent: React.FC<SystemStatusModalProps> = ({
111118
</div>
112119
</>
113120
) : (
114-
<div>No data found for {activeSystem}</div>
121+
<div>No data found</div>
115122
)}
116123
</div>
117124
</div>

designsafe/apps/api/datafiles/migrations/0002_userfavorite.py

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,30 @@ class Migration(migrations.Migration):
99

1010
dependencies = [
1111
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
12-
('datafiles', '0001_initial'),
12+
("datafiles", "0001_initial"),
1313
]
1414

1515
operations = [
1616
migrations.CreateModel(
17-
name='UserFavorite',
17+
name="UserFavorite",
1818
fields=[
19-
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
20-
('file_path', models.TextField()),
21-
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
19+
(
20+
"id",
21+
models.AutoField(
22+
auto_created=True,
23+
primary_key=True,
24+
serialize=False,
25+
verbose_name="ID",
26+
),
27+
),
28+
("file_path", models.TextField()),
29+
(
30+
"user",
31+
models.ForeignKey(
32+
on_delete=django.db.models.deletion.CASCADE,
33+
to=settings.AUTH_USER_MODEL,
34+
),
35+
),
2236
],
2337
),
2438
]

designsafe/apps/api/datafiles/migrations/0003_userfavorite_added_on_userfavorite_tool_id_and_more.py

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,31 @@ class Migration(migrations.Migration):
99

1010
dependencies = [
1111
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
12-
('datafiles', '0002_userfavorite'),
12+
("datafiles", "0002_userfavorite"),
1313
]
1414

1515
operations = [
1616
migrations.AddField(
17-
model_name='userfavorite',
18-
name='added_on',
19-
field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2025, 6, 19, 15, 35, 58, 410115)),
17+
model_name="userfavorite",
18+
name="added_on",
19+
field=models.DateTimeField(
20+
auto_now_add=True,
21+
default=datetime.datetime(2025, 6, 19, 15, 35, 58, 410115),
22+
),
2023
preserve_default=False,
2124
),
2225
migrations.AddField(
23-
model_name='userfavorite',
24-
name='tool_id',
25-
field=models.CharField(default='unknown-tool', max_length=100),
26+
model_name="userfavorite",
27+
name="tool_id",
28+
field=models.CharField(default="unknown-tool", max_length=100),
2629
preserve_default=False,
2730
),
2831
migrations.AlterUniqueTogether(
29-
name='userfavorite',
30-
unique_together={('user', 'tool_id')},
32+
name="userfavorite",
33+
unique_together={("user", "tool_id")},
3134
),
3235
migrations.RemoveField(
33-
model_name='userfavorite',
34-
name='file_path',
36+
model_name="userfavorite",
37+
name="file_path",
3538
),
3639
]

designsafe/apps/api/filemeta/migrations/0003_remove_filemetamodel_unique_system_path.py

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

designsafe/settings/rt_settings.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
('DATA_CURATION_PUBLICATION', 'Data Curation & Publication'),
1313
('DATA_DEPOT', 'Data Depot'),
1414
('TOOLS_APPS', 'Tools & Applications'),
15+
('ALLOCATIONS', 'Allocations'),
1516
('LOGIN', 'Login/Registration'),
1617
('OTHER', 'Other'),
1718
)

designsafe/settings/test_settings.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -778,6 +778,7 @@
778778
('DATA_CURATION_PUBLICATION', 'Data Curation & Publication'),
779779
('DATA_DEPOT', 'Data Depot'),
780780
('DISCOVERY_WORKSPACE', 'Discovery Workspace'),
781+
('ALLOCATIONS', 'Allocations'),
781782
('LOGIN', 'Login/Registration'),
782783
('OTHER', 'Other'),
783784
)

0 commit comments

Comments
 (0)