DSP-638 Value Deletion Comment #198

mdelez · 2020-09-30T12:39:42Z

closes https://dasch.myjetbrains.com/youtrack/issue/DSP-638

…to provide a comment when deleting a value

mdelez · 2020-10-01T07:30:12Z

@flavens what do you think about this design? Should the label and input be side-by-side or is this okay?

flavens · 2020-10-01T08:59:45Z

@flavens what do you think about this design? Should the label and input be side-by-side or is this okay?

I would rather use a textarea (you can configure the size to keep it small) because an input may be too short. The label can be the placeholder, instead of being outside of the field. It saves some space. The label could be more straight forward, e.g. "Comment about the deletion" or something like this..

…and added a placeholder. Also fixed an error where clicking outside of the dialog box would close the component but try to access an undefined object member.

…s to _viewer file

…t is provided

flavens

LGTM

tobiasschweizer · 2020-10-05T12:53:49Z

...action/components/confirmation-dialog/confirmation-message/confirmation-message.component.ts

@@ -9,7 +9,12 @@ import { ReadValue } from '@dasch-swiss/dsp-js';
 export class ConfirmationMessageComponent {

    @Input() value: ReadValue;
+    comment: string;


Could the comment by made optional?

made optional in 050a4cd

tobiasschweizer · 2020-10-05T12:56:00Z

projects/dsp-ui/src/lib/action/components/confirmation-dialog/confirmation-dialog.component.ts


 export class ConfirmationDialogData {
    value: ReadValue;
    buttonTextOk: string;
    buttonTextCancel: string;
 }

+export class ConfirmationDialogPayload {
+    confirmed: boolean;
+    deletionComment: string;


Could the deletionComment be made optional (instead of setting it to null when there is no deletion comment)?

made optional in 050a4cd

tobiasschweizer · 2020-10-05T12:56:14Z

projects/dsp-ui/src/lib/action/components/confirmation-dialog/confirmation-dialog.component.ts

-        this._dialogRef.close(true);
+        const payload = new ConfirmationDialogPayload();
+        payload.confirmed = true;
+        payload.deletionComment = this.confirmationMessageComponent.comment ? this.confirmationMessageComponent.comment : null;


see my comment above

changed to undefined if a comment is not provided in 050a4cd

tobiasschweizer · 2020-10-05T12:57:03Z

projects/dsp-ui/src/lib/action/components/confirmation-dialog/confirmation-dialog.component.ts

+    confirmed: boolean;
+    deletionComment: string;
+}
+
 @Component({
  selector: 'dsp-confirmation-dialog',
  templateUrl: './confirmation-dialog.component.html',
  styleUrls: ['./confirmation-dialog.component.scss']
 })
 export class ConfirmationDialogComponent {


Is this component specific for value deletion? If so, could its name say so?

renamed in 050a4cd

tobiasschweizer · 2020-10-05T12:57:32Z

projects/dsp-ui/src/lib/viewer/operations/display-edit/display-edit.component.spec.ts

@@ -937,6 +938,7 @@ describe('DisplayEditComponent', () => {
        const deleteVal = new DeleteValue();
        deleteVal.id = 'http://rdfh.ch/0001/H6gBWUuJSuuO-CilHV8kQw/values/dJ1ES8QTQNepFKF5-EAqdg';
        deleteVal.type = 'http://api.knora.org/ontology/knora-api/v2#IntValue';
+        deleteVal.deleteComment = null;


see my comment about optional comments :-)

made optional in 050a4cd

tobiasschweizer · 2020-10-05T12:59:17Z

projects/dsp-ui/src/lib/viewer/operations/display-edit/display-edit.component.ts

-                this.deleteValue();
+        dialogRef.afterClosed().subscribe((payload: ConfirmationDialogPayload) => {
+            if (payload && payload.confirmed) {
+                this.deleteValue(payload.deletionComment);


What happens if null is passed?

made optional in 050a4cd

tobiasschweizer · 2020-10-05T13:00:25Z

projects/dsp-ui/src/assets/style/_viewer.scss

@@ -160,3 +160,30 @@ button.save .mat-icon,
 button.cancel .mat-icon {
  font-size: 18px;
 }
+
+.deletion-dialog .title {


Is this more general than value deletion? Wouldn't it make more sense to keep it in the component's CSS file?

After some thinking, I should refactor this a little. The current ConfirmationMessage component should be renamed and made more specific to a deletion message. This way the ConfirmationDialog component can be reused and you can just supply it with the Message component of your choosing.

Ideally the ConfirmationDialog component is just a shell with a button to confirm and a button to cancel and its contents is defined by the type of message component you give it. We should handle this in another PR though.

Task created https://dasch.myjetbrains.com/youtrack/issue/DSP-781

mdelez · 2020-10-05T14:19:19Z

Should this be unsubscribed from? dialogRef.afterClosed().subscribe

Edit: The answer is no. I appreciate how simple this guy made it to understand https://stackoverflow.com/a/58199099

- renamed ConfirmationDialogPayload to ConfirmationDialogValueDeletionPayload - refactored the deletion comment to be optional so that it will be undefined instead of null if a comment is not provided

tobiasschweizer

Great, thanks for the adaptions.

enhancement (confirmation dialog): added an input field for the user …

5e11a78

…to provide a comment when deleting a value

mdelez self-assigned this Sep 30, 2020

mdelez added the enhancement New feature or request label Sep 30, 2020

mdelez mentioned this pull request Oct 1, 2020

DSP-623 Color Value Polish #191

Merged

mdelez added 4 commits October 1, 2020 13:33

enhancement (confirmation dialog): changed the input into a textarea …

6b78c2b

…and added a placeholder. Also fixed an error where clicking outside of the dialog box would close the component but try to access an undefined object member.

style (confirmation message): moved css from global file to _viewer file

b113b22

style (confirmation css): move all confirmation dialog and message cs…

1c657c6

…s to _viewer file

tests (display-edit): added a test for a case where a deletion commen…

b65052c

…t is provided

mdelez requested review from tobiasschweizer and flavens October 2, 2020 10:59

flavens approved these changes Oct 5, 2020

View reviewed changes

tobiasschweizer reviewed Oct 5, 2020

View reviewed changes

mdelez added 2 commits October 6, 2020 09:13

Merge branch 'master' into wip/dsp-638-value-deletion-comment

8a09c7e

refactor (confirmation components):

050a4cd

- renamed ConfirmationDialogPayload to ConfirmationDialogValueDeletionPayload - refactored the deletion comment to be optional so that it will be undefined instead of null if a comment is not provided

mdelez requested a review from tobiasschweizer October 6, 2020 08:06

tobiasschweizer approved these changes Oct 6, 2020

View reviewed changes

mdelez merged commit 29f259d into master Oct 6, 2020

mdelez deleted the wip/dsp-638-value-deletion-comment branch October 6, 2020 11:18

kilchenmann changed the title ~~Value Deletion Comment~~ DSP-638 Value Deletion Comment Oct 12, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

DSP-638 Value Deletion Comment #198

DSP-638 Value Deletion Comment #198

mdelez commented Sep 30, 2020 •

edited

Loading

mdelez commented Oct 1, 2020

flavens commented Oct 1, 2020 •

edited

Loading

flavens left a comment

tobiasschweizer Oct 5, 2020

mdelez Oct 6, 2020

tobiasschweizer Oct 5, 2020

mdelez Oct 6, 2020

tobiasschweizer Oct 5, 2020

mdelez Oct 6, 2020

tobiasschweizer Oct 5, 2020

mdelez Oct 6, 2020

tobiasschweizer Oct 5, 2020

mdelez Oct 6, 2020

tobiasschweizer Oct 5, 2020

mdelez Oct 6, 2020

tobiasschweizer Oct 5, 2020

mdelez Oct 6, 2020 •

edited

Loading

mdelez commented Oct 5, 2020 •

edited

Loading

tobiasschweizer left a comment

DSP-638 Value Deletion Comment #198

DSP-638 Value Deletion Comment #198

Conversation

mdelez commented Sep 30, 2020 • edited Loading

mdelez commented Oct 1, 2020

flavens commented Oct 1, 2020 • edited Loading

flavens left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mdelez Oct 6, 2020 • edited Loading

Choose a reason for hiding this comment

mdelez commented Oct 5, 2020 • edited Loading

tobiasschweizer left a comment

Choose a reason for hiding this comment

mdelez commented Sep 30, 2020 •

edited

Loading

flavens commented Oct 1, 2020 •

edited

Loading

mdelez Oct 6, 2020 •

edited

Loading

mdelez commented Oct 5, 2020 •

edited

Loading