Skip to content

Commit 98f0af2

Browse files
authored
feat: [WD-34757] Reevaluate expiry logic for instances and volumes (#1876)
## Done - Removed default expiry time select for instances **and** volumes. - Default expiry time remains 6 hours following this [thread conversation](https://chat.canonical.com/canonical/pl/d9hyzssdmtn35mpopwix5auqdo). Fixes concerns regarding export transparency highlighted during user testing. ## QA 1. Run the LXD-UI: - On the demo server via the link posted by @webteam-app below. This is only available for PRs created by collaborators of the repo. Ask @Kxiru or @edlerd for access. - With a local copy of this branch, [build and run as described in the docs](https://github.com/canonical/lxd-ui/blob/main/CONTRIBUTING.md#setting-up-for-development). 2. Perform the following QA steps: - Verify expiry time is removed in instance / volume export. ## Screenshots Before: <img width="1920" height="871" alt="image" src="https://github.com/user-attachments/assets/bc975ae6-4f49-44fa-acc3-3d9a8e7d46e8" /> After: <img width="1920" height="871" alt="image" src="https://github.com/user-attachments/assets/a62cb082-103e-441b-916f-2c3446bea38d" />
2 parents 4d66d23 + 22c0383 commit 98f0af2

2 files changed

Lines changed: 0 additions & 28 deletions

File tree

src/pages/instances/forms/ExportInstanceModal.tsx

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -192,20 +192,6 @@ const ExportInstanceModal: FC<Props> = ({ instance, close }) => {
192192
{ value: "none", label: "None" },
193193
]}
194194
/>
195-
<Select
196-
{...formik.getFieldProps("expirationHours")}
197-
id="project"
198-
label="Expiration"
199-
help="Duration that the backup remains on the server"
200-
options={[
201-
{ value: 1, label: "1 hour" },
202-
{ value: 6, label: "6 hours" },
203-
{ value: 12, label: "12 hours" },
204-
{ value: 24, label: "1 day" },
205-
{ value: 72, label: "3 days" },
206-
{ value: 168, label: "7 days" },
207-
]}
208-
/>
209195
{hasBackupMetadataVersion && (
210196
<Select
211197
{...formik.getFieldProps("exportVersion")}

src/pages/storage/forms/ExportVolumeModal.tsx

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -170,20 +170,6 @@ const ExportVolumeModal: FC<Props> = ({ volume, close }) => {
170170
{ value: "none", label: "None" },
171171
]}
172172
/>
173-
<Select
174-
{...formik.getFieldProps("expirationHours")}
175-
id="project"
176-
label="Expiration"
177-
help="Duration that the backup remains on the server"
178-
options={[
179-
{ value: 1, label: "1 hour" },
180-
{ value: 6, label: "6 hours" },
181-
{ value: 12, label: "12 hours" },
182-
{ value: 24, label: "1 day" },
183-
{ value: 72, label: "3 days" },
184-
{ value: 168, label: "7 days" },
185-
]}
186-
/>
187173
{hasBackupMetadataVersion && (
188174
<Select
189175
{...formik.getFieldProps("exportVersion")}

0 commit comments

Comments
 (0)