Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 71 additions & 0 deletions src/app/core/services/edit/edit.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,77 @@ describe('EditService', () => {
expect(apiService.folder.getStelaFolderVOs).not.toHaveBeenCalled();
});

it('should revert property and show error when updateStelaRecord fails', async () => {
const messageService = TestBed.inject(MessageService);
spyOn(messageService, 'showError');

const record = new RecordVO({ recordId: 1, displayTime: 'original-value' });
const httpError = {
error: { message: 'Invalid date format' },
message: 'Http failure',
};

(apiService.record.updateStelaRecord as jasmine.Spy).and.returnValue(
Promise.reject(httpError),
);
(apiService.record.update as jasmine.Spy).and.returnValue(
Promise.resolve([]),
);

await service.saveItemVoProperty(record, 'displayTime', 'new-value');

expect(record.displayTime).toBe('original-value');
expect(messageService.showError).toHaveBeenCalledWith({
message: 'Invalid date format',
});
});

it('should show fallback error when updateStelaRecord fails without error body', async () => {
const messageService = TestBed.inject(MessageService);
spyOn(messageService, 'showError');

const record = new RecordVO({ recordId: 1, displayTime: 'original-value' });

(apiService.record.updateStelaRecord as jasmine.Spy).and.returnValue(
Promise.reject({}),
);
(apiService.record.update as jasmine.Spy).and.returnValue(
Promise.resolve([]),
);

await service.saveItemVoProperty(record, 'displayTime', 'new-value');

expect(record.displayTime).toBe('original-value');
expect(messageService.showError).toHaveBeenCalledWith({
message: 'Failed to save changes',
});
});

it('should revert property and show error when updateStelaFolder fails', async () => {
const messageService = TestBed.inject(MessageService);
spyOn(messageService, 'showError');

const folder = new FolderVO({ folderId: 1, displayTime: 'original-value' });
const httpError = { error: { error: 'Invalid EDTF string' } };

(apiService.folder.updateStelaFolder as jasmine.Spy).and.returnValue(
Promise.reject(httpError),
);
(apiService.folder.update as jasmine.Spy).and.returnValue(
Promise.resolve({}),
);
(apiService.folder.getStelaFolderVOs as jasmine.Spy).and.returnValue(
Promise.resolve({ getFolderVOs: () => [] }),
);

await service.saveItemVoProperty(folder, 'displayTime', 'new-value');

expect(folder.displayTime).toBe('original-value');
expect(messageService.showError).toHaveBeenCalledWith({
message: 'Invalid EDTF string',
});
});

describe('openShareDialog', () => {
const mockShareLink: ShareLink = {
id: 'link1',
Expand Down
19 changes: 16 additions & 3 deletions src/app/core/services/edit/edit.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -356,10 +356,23 @@ export class EditService {
item.update(newData);
await this.updateItems([item], [property]);
} catch (err) {
const revertData: Partial<ItemVO> = {};
revertData[property] = originalValue;
item.update(revertData);

if (err instanceof FolderResponse || err instanceof RecordResponse) {
const revertData: Partial<ItemVO> = {};
revertData[property] = originalValue;
item.update(revertData);
this.message.showError({
message: err.getMessage(),
translate: true,
});
} else {
this.message.showError({
message:
err?.error?.message ||
err?.error?.error ||
err?.message ||
'Failed to save changes',
});
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
<div class="pr-edit-date-time-dialog">
<div class="pr-dialog-header">
<h2>Edit date and time</h2>
<button class="pr-close-button" (click)="onCancel()">
<i class="material-icons">close</i>
</button>
</div>

<div class="pr-dialog-content">
<!-- Date qualifiers -->
<div class="pr-qualifiers-row">
<span class="pr-qualifiers-label">This date is:</span>

<div class="pr-qualifier-option">
<span>Approximate</span>
<label class="pr-toggle">
<input
type="checkbox"
[checked]="qualifiers().approximate"
[disabled]="fieldsDisabled()"
(change)="onQualifierChange(DateQualifier.Approximate)"
/>
<span class="pr-toggle-slider"></span>
</label>
</div>

<div class="pr-qualifier-option">
<span>Uncertain</span>
<label class="pr-toggle">
<input
type="checkbox"
[checked]="qualifiers().uncertain"
[disabled]="fieldsDisabled()"
(change)="onQualifierChange(DateQualifier.Uncertain)"
/>
<span class="pr-toggle-slider"></span>
</label>
</div>

<div class="pr-qualifier-option">
<span>Unknown</span>
<label class="pr-toggle">
<input
type="checkbox"
[checked]="qualifiers().unknown"
(change)="onQualifierChange(DateQualifier.Unknown)"
/>
<span class="pr-toggle-slider"></span>
</label>
</div>
</div>

<!-- Date and Time inputs -->
<div class="pr-datetime-row" [class.disabled]="fieldsDisabled()">
<pr-datepicker-input
[date]="date()"
[disabled]="fieldsDisabled()"
(dateChange)="date.set($event)"
/>

<pr-timepicker-input
[time]="time()"
[disabled]="fieldsDisabled()"
(timeChange)="onTimeChange($event, time)"
/>
</div>

<!-- Timezone -->
<pr-timezone-dropdown
[selectedZone]="time().timezoneName"
[selectedOffsetFallback]="time().timezoneOffset"
[referenceDate]="startReferenceDate()"
[disabled]="fieldsDisabled()"
(timezoneChange)="onTimezoneChange($event, time)"
/>

<!-- End date range (shown when useDateRange is on) -->
@if (useDateRange()) {
<div class="pr-range-label">TO</div>

<div class="pr-datetime-row">
<pr-datepicker-input
[date]="endDate()"
(dateChange)="endDate.set($event)"
/>

<pr-timepicker-input
[time]="endTime()"
(timeChange)="onTimeChange($event, endTime)"
/>
</div>

<!-- End timezone -->
<pr-timezone-dropdown
[selectedZone]="endTime().timezoneName"
[selectedOffsetFallback]="endTime().timezoneOffset"
[referenceDate]="endReferenceDate()"
(timezoneChange)="onTimezoneChange($event, endTime)"
/>
}

<!-- Date range toggle + clear -->
<div class="pr-date-range-row">
<span>Use a date range</span>
<label class="pr-toggle">
<input
type="checkbox"
[checked]="useDateRange()"
[disabled]="fieldsDisabled()"
(change)="toggleDateRange()"
/>
<span class="pr-toggle-slider"></span>
</label>

<button class="pr-clear-btn" (click)="clearAll()">
<i class="material-icons">delete_outline</i>
<span>Clear date and time</span>
</button>
</div>
</div>

<!-- Footer -->
<div class="pr-dialog-footer">
<div class="pr-edtf-display">
@if (isEdtfValid()) {
<span
class="pr-edtf-value"
[ngbTooltip]="'Formatted EDTF date and time'"
placement="top"
>{{ edtfValue() }}</span
>
} @else {
<span class="pr-edtf-error">{{ edtfErrorMessage() }}</span>
}
</div>
<div class="pr-dialog-actions">
<button class="pr-btn-cancel" (click)="onCancel()">Cancel</button>
<button
class="pr-btn-save"
[disabled]="!isEdtfValid()"
(click)="onSave()"
>
Save
</button>
</div>
</div>
</div>
Loading
Loading