Skip to content

Commit 5cb5515

Browse files
Jillian InapurapuJillian Inapurapu
Jillian Inapurapu
authored and
Jillian Inapurapu
committed
Removed changes to EditILMRule to put in new PR
1 parent 98b9dc3 commit 5cb5515

File tree

7 files changed

+30
-158
lines changed

7 files changed

+30
-158
lines changed

‎models/update_bucket_lifecycle.go‎

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎portal-ui/src/api/consoleApi.ts‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,18 +1000,6 @@ export interface UpdateBucketLifecycle {
10001000
* @default 0
10011001
*/
10021002
noncurrentversion_transition_days?: number;
1003-
/**
1004-
* Non required, can be set in case of expiration is enabled
1005-
* @format int32
1006-
* @default 0
1007-
*/
1008-
newer_noncurrentversion_expiration_versions?: number;
1009-
/**
1010-
* Non required, can be set in case of transition is enabled
1011-
* @format int32
1012-
* @default 0
1013-
*/
1014-
newer_noncurrentversion_transition_versions?: number;
10151003
/** Non required, can be set in case of transition is enabled */
10161004
noncurrentversion_transition_storage_class?: string;
10171005
}

‎portal-ui/src/screens/Console/Buckets/BucketDetails/BucketLifecyclePanel.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ const BucketLifecyclePanel = () => {
8686
.getBucketLifecycle(bucketName)
8787
.then((res) => {
8888
const records = get(res.data, "lifecycle", []);
89-
console.log("records: ", records);
9089
setLifecycleRecords(records || []);
9190
setLoadingLifecycle(false);
9291
})

‎portal-ui/src/screens/Console/Buckets/BucketDetails/EditLifecycleConfiguration.tsx‎

Lines changed: 26 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,6 @@ const EditLifecycleConfiguration = ({
6868
const [expiredObjectDM, setExpiredObjectDM] = useState<boolean>(false);
6969
const [NCExpirationDays, setNCExpirationDays] = useState<string>("0");
7070
const [NCTransitionDays, setNCTransitionDays] = useState<string>("0");
71-
72-
const [newerNCExpirationVersions, setNewerNCExpirationVersions] =
73-
useState<string>("0");
74-
const [newerNCTransitionVersions, setNewerNCTransitionVersions] =
75-
useState<string>("0");
7671
const [ilmType, setIlmType] = useState<"transition" | "expiry">("expiry");
7772
const [expiryDays, setExpiryDays] = useState<string>("0");
7873
const [transitionDays, setTransitionDays] = useState<string>("0");
@@ -138,14 +133,6 @@ const EditLifecycleConfiguration = ({
138133
setIlmType("transition");
139134
transitionMode = true;
140135
}
141-
if (
142-
lifecycleRule.transition.newer_noncurrent_transition_versions &&
143-
lifecycleRule.transition.newer_noncurrent_transition_versions > 0
144-
) {
145-
setNewerNCTransitionVersions(
146-
lifecycleRule.transition.newer_noncurrent_transition_versions.toString(),
147-
);
148-
}
149136
if (
150137
lifecycleRule.transition.noncurrent_transition_days &&
151138
lifecycleRule.transition.noncurrent_transition_days !== 0
@@ -186,14 +173,7 @@ const EditLifecycleConfiguration = ({
186173
setIlmType("expiry");
187174
transitionMode = false;
188175
}
189-
if (
190-
lifecycleRule.expiration.newer_noncurrent_expiration_versions &&
191-
lifecycleRule.expiration.newer_noncurrent_expiration_versions > 0
192-
) {
193-
setNewerNCExpirationVersions(
194-
lifecycleRule.expiration.newer_noncurrent_expiration_versions.toString(),
195-
);
196-
}
176+
197177
// Fallback to old rules by date
198178
if (
199179
lifecycleRule.expiration.date &&
@@ -260,11 +240,7 @@ const EditLifecycleConfiguration = ({
260240
expiry["noncurrentversion_expiration_days"] =
261241
parseInt(NCExpirationDays);
262242
}
263-
if (lifecycleRule.expiration?.newer_noncurrent_expiration_versions) {
264-
expiry["newer_noncurrent_expiration_versions"] = parseInt(
265-
newerNCExpirationVersions,
266-
);
267-
}
243+
268244
rules = {
269245
...expiry,
270246
};
@@ -407,38 +383,18 @@ const EditLifecycleConfiguration = ({
407383
)}
408384

409385
{ilmType === "expiry" &&
410-
(lifecycleRule.expiration?.noncurrent_expiration_days ||
411-
lifecycleRule.expiration
412-
?.newer_noncurrent_expiration_versions) && (
413-
<Fragment>
414-
{lifecycleRule.expiration?.noncurrent_expiration_days && (
415-
<InputBox
416-
type="number"
417-
id="noncurrentversion_expiration_days"
418-
name="noncurrentversion_expiration_days"
419-
onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
420-
setNCExpirationDays(e.target.value);
421-
}}
422-
label="Non-current Expiration Days"
423-
value={NCExpirationDays}
424-
min="0"
425-
/>
426-
)}
427-
{lifecycleRule.expiration
428-
?.newer_noncurrent_expiration_versions && (
429-
<InputBox
430-
type="number"
431-
id="newer_noncurrentversion_expiration_versions"
432-
name="newer_noncurrentversion_expiration_versions"
433-
onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
434-
setNewerNCExpirationVersions(e.target.value);
435-
}}
436-
label="Non-current Expiration Versions"
437-
value={newerNCExpirationVersions}
438-
min="0"
439-
/>
440-
)}
441-
</Fragment>
386+
lifecycleRule.expiration?.noncurrent_expiration_days && (
387+
<InputBox
388+
type="number"
389+
id="noncurrentversion_expiration_days"
390+
name="noncurrentversion_expiration_days"
391+
onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
392+
setNCExpirationDays(e.target.value);
393+
}}
394+
label="Non-current Expiration Days"
395+
value={NCExpirationDays}
396+
min="0"
397+
/>
442398
)}
443399
{ilmType === "transition" && lifecycleRule.transition?.days && (
444400
<Fragment>
@@ -467,37 +423,19 @@ const EditLifecycleConfiguration = ({
467423
)}
468424

469425
{ilmType === "transition" &&
470-
(lifecycleRule.transition?.noncurrent_transition_days ||
471-
lifecycleRule.transition
472-
?.newer_noncurrent_transition_versions) && (
426+
lifecycleRule.transition?.noncurrent_transition_days && (
473427
<Fragment>
474-
{lifecycleRule.transition?.noncurrent_transition_days && (
475-
<InputBox
476-
type="number"
477-
id="noncurrentversion_transition_days"
478-
name="noncurrentversion_transition_days"
479-
onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
480-
setNCTransitionDays(e.target.value);
481-
}}
482-
label="Non-current Transition Days"
483-
value={NCTransitionDays}
484-
min="0"
485-
/>
486-
)}
487-
{lifecycleRule.transition
488-
?.newer_noncurrent_transition_versions && (
489-
<InputBox
490-
type="number"
491-
id="newer_noncurrentversion_transition_versions"
492-
name="newer_noncurrentversion_transition_versions"
493-
onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
494-
setNewerNCTransitionVersions(e.target.value);
495-
}}
496-
label="Non-current Transition Versions"
497-
value={newerNCTransitionVersions}
498-
min="0"
499-
/>
500-
)}
428+
<InputBox
429+
type="number"
430+
id="noncurrentversion_transition_days"
431+
name="noncurrentversion_transition_days"
432+
onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
433+
setNCTransitionDays(e.target.value);
434+
}}
435+
label="Non-current Transition Days"
436+
value={NCTransitionDays}
437+
min="0"
438+
/>
501439
<InputBox
502440
id="noncurrentversion_t_SC"
503441
name="noncurrentversion_t_SC"

‎restapi/embedded_spec.go‎

Lines changed: 0 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎restapi/user_buckets_lifecycle.go‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,8 @@ func editBucketLifecycle(ctx context.Context, client MinioClient, params bucketA
298298
// Verify if transition items are set
299299
switch *params.Body.Type {
300300
case models.UpdateBucketLifecycleTypeTransition:
301-
if params.Body.TransitionDays == 0 && params.Body.NoncurrentversionTransitionDays == 0 && params.Body.NewerNoncurrentversionTransitionVersions == 0 {
302-
return errors.New("you must select transition days or non-current transition days/versions configuration")
301+
if params.Body.TransitionDays == 0 && params.Body.NoncurrentversionTransitionDays == 0 {
302+
return errors.New("you must select transition days or non-current transition days configuration")
303303
}
304304

305305
status := !params.Body.Disable
@@ -317,15 +317,7 @@ func editBucketLifecycle(ctx context.Context, client MinioClient, params bucketA
317317
opts.NoncurrentVersionTransitionDays = &noncurrentVersionTransitionDays
318318
opts.NoncurrentVersionTransitionStorageClass = &noncurrentVersionTransitionStorageClass
319319

320-
}
321-
switch {
322-
case params.Body.NewerNoncurrentversionTransitionVersions > 0:
323-
newerNoncurrentVersionTransitionVersions := int(params.Body.NewerNoncurrentversionTransitionVersions)
324-
noncurrentVersionTransitionStorageClass := strings.ToUpper(params.Body.NoncurrentversionTransitionStorageClass)
325-
opts.NewerNoncurrentExpirationVersions = &newerNoncurrentVersionTransitionVersions
326-
opts.NoncurrentVersionTransitionStorageClass = &noncurrentVersionTransitionStorageClass
327-
328-
case params.Body.TransitionDays > 0:
320+
} else {
329321
tdays := strconv.Itoa(int(params.Body.TransitionDays))
330322
sclass := strings.ToUpper(params.Body.StorageClass)
331323
opts.TransitionDays = &tdays
@@ -352,12 +344,7 @@ func editBucketLifecycle(ctx context.Context, client MinioClient, params bucketA
352344
if params.Body.NoncurrentversionExpirationDays > 0 {
353345
days := int(params.Body.NoncurrentversionExpirationDays)
354346
opts.NoncurrentVersionExpirationDays = &days
355-
}
356-
switch {
357-
case params.Body.NewerNoncurrentversionExpirationVersions > 0:
358-
versions := int(params.Body.NewerNoncurrentversionExpirationVersions)
359-
opts.NewerNoncurrentExpirationVersions = &versions
360-
case params.Body.ExpiryDays > 0:
347+
} else {
361348
days := strconv.Itoa(int(params.Body.ExpiryDays))
362349
opts.ExpiryDays = &days
363350
}

‎swagger.yml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5267,16 +5267,6 @@ definitions:
52675267
type: integer
52685268
format: int32
52695269
default: 0
5270-
newer_noncurrentversion_expiration_versions:
5271-
description: Non required, can be set in case of expiration is enabled
5272-
type: integer
5273-
format: int32
5274-
default: 0
5275-
newer_noncurrentversion_transition_versions:
5276-
description: Non required, can be set in case of transition is enabled
5277-
type: integer
5278-
format: int32
5279-
default: 0
52805270
noncurrentversion_transition_storage_class:
52815271
description: Non required, can be set in case of transition is enabled
52825272
type: string

0 commit comments

Comments
 (0)