[MNT-23433] Close Preview button position #3535

AnukritiGL · 2023-11-23T07:09:53Z

Please check if the PR fulfills these requirements

The commit message follows our guidelines

Tests for the changes have been added (for bug fixes / features)

Docs have been added / updated (for bug fixes / features)

What kind of change does this PR introduce? (check one with "x")

Bugfix

Feature

Code style update (formatting, local variables)

Refactoring (no functional changes, no api changes)

Build related changes

Documentation

Other... Please describe:

What is the current behaviour? (You can also link to an open issue here)
The button to close the preview is located on the left side while the other control buttons are on the right.

What is the new behaviour?
The button to close the preview is now configurable, customer can set the position of close button either left or right.

Does this PR introduce a breaking change? (check one with "x")

Yes

No

If this PR contains a breaking change, please describe the impact and migration path for existing applications: ...

Other information:
https://alfresco.atlassian.net/browse/MNT-23433
Dependent PR: Alfresco/alfresco-ng2-components#9143

projects/aca-content/viewer/src/lib/components/viewer/viewer.component.html

projects/aca-shared/rules/src/app.rules.ts

MichalKinas · 2023-11-27T10:55:42Z

app/src/app.config.json

@@ -1132,6 +1132,7 @@
    "downloadPromptDelay": 50,
    "downloadPromptReminderDelay": 30,
    "enableFileAutoDownload": true,
-    "fileAutoDownloadSizeThresholdInMB": 15
+    "fileAutoDownloadSizeThresholdInMB": 15,
+    "isCloseButtonOnLeft": false


If we want to make button position configurable I think that this param should accept right or left values and also I think the name of the param should be adjusted

This comment is unfixed still, I also mentioned the same improvement in ADF PR

Done

MichalKinas · 2023-11-27T11:02:17Z

projects/aca-content/assets/app.extensions.json

@@ -1177,6 +1177,23 @@
              }
            }
          ]
+        },
+        {
+          "id": "app.viewer.separator.1",


Ids of elements should be unique

MichalKinas · 2023-11-27T11:06:51Z

projects/aca-content/assets/app.extensions.json

+          "order": 11000
+        },
+        {
+          "id": "app.viewer.close",


I don't think we should add new button for that, the close button already exist in ADF and ACA should just set the position value which should be passed to the ADF component which will correctly place the button.

@MichalKinas to move the close button to the right side in the header we have to add the close button in toolbar-actions, and for left position we are using the existing button only.

Why do you think you have to add new button in ACA? This is another thing that has to be maintained, is not documented properly, has naming issues and rule canClosePreview doesn't do what it's name suggests. This should be part of ADF component which should take a param with position of close button. This solution works in ACA only and overrides default component behaviour, I still think that the solution should be adding new param for ADF component and component itself should decide how to display the close button

@MichalKinas as per your suggestion I have removed the close button from toolbar-actions,now I am planning to add one more button in ADF viewer.component.html which will be show/hide as per the position set by customer in app.config.json which can be configuration from ACA or ADF.

projects/aca-content/assets/i18n/en.json

projects/aca-shared/rules/src/app.rules.spec.ts

projects/aca-content/viewer/src/lib/components/viewer/viewer.component.scss

MichalKinas · 2023-12-08T08:04:10Z

app/src/app.config.json

@@ -1132,6 +1132,7 @@
    "downloadPromptDelay": 50,
    "downloadPromptReminderDelay": 30,
    "enableFileAutoDownload": true,
-    "fileAutoDownloadSizeThresholdInMB": 15
+    "fileAutoDownloadSizeThresholdInMB": 15,
+    "isCloseButtonOnLeft": false


This comment is unfixed still, I also mentioned the same improvement in ADF PR

Done

MichalKinas · 2023-12-08T08:04:35Z

projects/aca-content/viewer/src/lib/components/viewer/viewer.component.html

@@ -13,6 +13,7 @@
    [allowDownload]="false"
    [allowFullScreen]="false"
    [overlayMode]="true"
+    [allowGoBack]="'viewer.isCloseButtonOnLeft' | adfAppConfig: false"


allowGoBack should be unchanged here

MichalKinas · 2023-12-08T08:04:58Z

projects/aca-content/viewer/src/lib/components/viewer/viewer.component.scss

  // todo: remove this when viewer supports extensions
-  .adf-viewer-toolbar > * > button:last-child {
+  .adf-viewer-toolbar > * > button:nth-last-child(3) {


Why do you need this change?

MichalKinas · 2023-12-12T16:36:47Z

projects/aca-content/viewer/src/lib/components/viewer/viewer.component.html

    [allowPrint]="false"
    [showRightSidebar]="true"
    [allowDownload]="false"
    [allowFullScreen]="false"
    [overlayMode]="true"
+    [closeButtonPosition]="'viewer.closeButtonPosition' | adfAppConfig: 'right'"


Did you check if that works with left as a default value in ADF? And also if that works if the param is not set in the config file

Yes, I checked with default value as left as well working fine and also I try after removing the param from config file, it will come at right by default.

projects/aca-content/viewer/src/lib/components/viewer/viewer.component.html

sonarcloud · 2024-01-03T07:34:26Z

Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

AnukritiGL marked this pull request as ready for review November 23, 2023 07:19

AnukritiGL requested review from DenysVuika and eromano as code owners November 23, 2023 07:19

rbahirsheth added the peer review fta3 label Nov 23, 2023

rbahirsheth reviewed Nov 23, 2023

View reviewed changes

projects/aca-content/viewer/src/lib/components/viewer/viewer.component.html Outdated Show resolved Hide resolved

rbahirsheth reviewed Nov 23, 2023

View reviewed changes

projects/aca-shared/rules/src/app.rules.ts Outdated Show resolved Hide resolved

AnukritiGL force-pushed the MNT-23433-preview-buttons-positions branch 3 times, most recently from dd3902d to 0e09321 Compare November 27, 2023 06:34

rbahirsheth approved these changes Nov 27, 2023

View reviewed changes

rbahirsheth removed the peer review fta3 label Nov 27, 2023

MichalKinas requested changes Nov 27, 2023

View reviewed changes

AleksanderSklorz reviewed Nov 30, 2023

View reviewed changes

projects/aca-content/assets/i18n/en.json Outdated Show resolved Hide resolved

AleksanderSklorz reviewed Nov 30, 2023

View reviewed changes

projects/aca-shared/rules/src/app.rules.spec.ts Outdated Show resolved Hide resolved

AleksanderSklorz reviewed Nov 30, 2023

View reviewed changes

projects/aca-shared/rules/src/app.rules.spec.ts Outdated Show resolved Hide resolved

AnukritiGL force-pushed the MNT-23433-preview-buttons-positions branch from 187bff8 to e0f6e1c Compare December 7, 2023 06:29

AnukritiGL requested a review from MichalKinas December 7, 2023 13:04

AleksanderSklorz reviewed Dec 8, 2023

View reviewed changes

projects/aca-content/viewer/src/lib/components/viewer/viewer.component.scss Outdated Show resolved Hide resolved

MichalKinas requested changes Dec 8, 2023

View reviewed changes

AnukritiGL force-pushed the MNT-23433-preview-buttons-positions branch from ee295e9 to e11c763 Compare December 12, 2023 12:47

AnukritiGL requested a review from MichalKinas December 12, 2023 14:14

MichalKinas reviewed Dec 12, 2023

View reviewed changes

AleksanderSklorz reviewed Dec 13, 2023

View reviewed changes

projects/aca-content/viewer/src/lib/components/viewer/viewer.component.html Outdated Show resolved Hide resolved

AnukritiGL requested review from MichalKinas and AleksanderSklorz December 14, 2023 13:26

AnukritiGL mentioned this pull request Dec 15, 2023

[MNT-23433] configure position for close button on Viewer Alfresco/alfresco-ng2-components#9143

Merged

AnukritiGL force-pushed the MNT-23433-preview-buttons-positions branch 2 times, most recently from 565d5b3 to 0387629 Compare December 27, 2023 13:43

swapnil-verma-gl approved these changes Dec 28, 2023

View reviewed changes

AnukritiGL force-pushed the MNT-23433-preview-buttons-positions branch from 94ea35d to a6c24e2 Compare December 28, 2023 12:16

AnukritiGL force-pushed the MNT-23433-preview-buttons-positions branch from a6c24e2 to 8545baf Compare January 2, 2024 12:42

AnukritiGL added 10 commits January 3, 2024 11:42

[MNT-23433] preview button configure

8d5d742

[MNT-23433] e2e fix

090d175

[MNT-23433] e2e fix for protractor

d95f197

[MNT-23433] default position set to right

dc8738e

[MNT-23433] close button added for e2e

6d665f5

[MNT-23433] documentation added

2226259

[MNT-23433] removed close button from toolbar

4f8fa23

[MNT-23433] passing close button position

93e8f95

[MNT-23433] hide info icon

46565a2

[MNT-23433] add property for info button

db141b6

AnukritiGL force-pushed the MNT-23433-preview-buttons-positions branch from 8545baf to db141b6 Compare January 3, 2024 06:12

AleksanderSklorz approved these changes Jan 3, 2024

View reviewed changes

Upstream ADF-6.6.0-7386887320, Js-api-7.5.0-7386887320 version

8b531a6

MichalKinas approved these changes Jan 3, 2024

View reviewed changes

AnukritiGL merged commit 6da7152 into develop Jan 3, 2024
26 checks passed

AnukritiGL deleted the MNT-23433-preview-buttons-positions branch January 3, 2024 07:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[MNT-23433] Close Preview button position #3535

[MNT-23433] Close Preview button position #3535

AnukritiGL commented Nov 23, 2023 •

edited

MichalKinas Nov 27, 2023

MichalKinas Dec 8, 2023 •

edited by AnukritiGL

MichalKinas Nov 27, 2023

MichalKinas Nov 27, 2023

AnukritiGL Nov 27, 2023 •

edited

MichalKinas Nov 29, 2023

AnukritiGL Dec 5, 2023

MichalKinas Dec 8, 2023 •

edited by AnukritiGL

MichalKinas Dec 8, 2023

AnukritiGL Jan 2, 2024

MichalKinas Dec 8, 2023

AnukritiGL Jan 2, 2024

MichalKinas Dec 12, 2023

AnukritiGL Dec 13, 2023

sonarcloud bot commented Jan 3, 2024

[MNT-23433] Close Preview button position #3535

[MNT-23433] Close Preview button position #3535

Conversation

AnukritiGL commented Nov 23, 2023 • edited

Choose a reason for hiding this comment

MichalKinas Dec 8, 2023 • edited by AnukritiGL

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AnukritiGL Nov 27, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MichalKinas Dec 8, 2023 • edited by AnukritiGL

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

sonarcloud bot commented Jan 3, 2024

Quality Gate passed

AnukritiGL commented Nov 23, 2023 •

edited

MichalKinas Dec 8, 2023 •

edited by AnukritiGL

AnukritiGL Nov 27, 2023 •

edited

MichalKinas Dec 8, 2023 •

edited by AnukritiGL