Skip to content

Commit 5e1daff

Browse files
authored
Fix off-by-one error for request access end date (#235)
1 parent c75f065 commit 5e1daff

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "data-portal",
3-
"version": "2.2.8",
3+
"version": "2.2.9",
44
"scripts": {
55
"ng": "ng",
66
"start": "ng serve",

src/app/access-requests/features/access-request-dialog/access-request-dialog.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export class AccessRequestDialogComponent {
8888
d.setHours(23, 59, 59, 999);
8989
this.minUntilDate.setDate(d.getDate() + this.#config.accessGrantMinDays);
9090

91-
d.setDate(d.getDate() + this.#config.defaultAccessDurationDays);
91+
d.setDate(d.getDate() + this.#config.defaultAccessDurationDays - 1);
9292
this.untilDate.set(d);
9393

9494
this.updateUntilRangeForFromValue(new Date(this.todayMidnight));
@@ -207,7 +207,7 @@ export class AccessRequestDialogComponent {
207207

208208
const newFromMinDate = new Date(date);
209209
const dateMinusGrantMaxDays = new Date(date);
210-
dateMinusGrantMaxDays.setDate(date.getDate() - this.#config.accessGrantMaxDays);
210+
dateMinusGrantMaxDays.setDate(date.getDate() - this.#config.accessGrantMaxDays - 1);
211211
newFromMinDate.setTime(
212212
Math.max(dateMinusGrantMaxDays.getTime(), currentDate.getTime()),
213213
);
@@ -217,7 +217,7 @@ export class AccessRequestDialogComponent {
217217
dateMinusGrantMinDays.setDate(date.getDate() - this.#config.accessGrantMinDays);
218218
const currentDatePlusUpfrontMaxDays = new Date(currentDate);
219219
currentDatePlusUpfrontMaxDays.setDate(
220-
currentDate.getDate() + this.#config.accessUpfrontMaxDays,
220+
currentDate.getDate() + this.#config.accessUpfrontMaxDays - 1,
221221
);
222222
newFromMaxDate.setTime(
223223
Math.min(
@@ -240,7 +240,7 @@ export class AccessRequestDialogComponent {
240240
newUntilMinDate.setDate(date.getDate() + this.#config.accessGrantMinDays);
241241
const newUntilMaxDate = new Date(date);
242242
newUntilMaxDate.setHours(23, 59, 59, 999);
243-
newUntilMaxDate.setDate(date.getDate() + this.#config.accessGrantMaxDays);
243+
newUntilMaxDate.setDate(date.getDate() + this.#config.accessGrantMaxDays - 1);
244244

245245
this.minUntilDate = newUntilMinDate;
246246
this.maxUntilDate = newUntilMaxDate;

0 commit comments

Comments
 (0)