From 9bb6c1a59f4c390a5c7bb70b8bfb3389875576fb Mon Sep 17 00:00:00 2001 From: Nalem7 <61624650+nabim777@users.noreply.github.com> Date: Thu, 21 Mar 2024 17:08:07 +0545 Subject: [PATCH 1/6] change comma with the dot (#609) Signed-off-by: nabim777 --- src/components/AdminSettings.vue | 2 +- tests/jest/components/AdminSettings.spec.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue index 0071f964c..d59c3011e 100644 --- a/src/components/AdminSettings.vue +++ b/src/components/AdminSettings.vue @@ -634,7 +634,7 @@ export default { const htmlLink = `${linkText}` switch (errorKey) { case 'The "Group folders" app is not installed' : - return t('integration_openproject', 'Please install the "Group folders" app to be able to use automatically managed folders, {htmlLink}', { htmlLink }, null, { escape: false, sanitize: false }) + return t('integration_openproject', 'Please install the "Group folders" app to be able to use automatically managed folders. {htmlLink}', { htmlLink }, null, { escape: false, sanitize: false }) default: return this.errorHintForProjectFolderConfigAlreadyExists } diff --git a/tests/jest/components/AdminSettings.spec.js b/tests/jest/components/AdminSettings.spec.js index 0b71506b5..24d8bf628 100644 --- a/tests/jest/components/AdminSettings.spec.js +++ b/tests/jest/components/AdminSettings.spec.js @@ -1040,7 +1040,7 @@ describe('AdminSettings.vue', () => { 'should set the project folder error message and error details when group folders app is not enabled', { error: 'The "Group folders" app is not installed', - expectedErrorDetailsMessage: 'Please install the "Group folders" app to be able to use automatically managed folders, {htmlLink}', + expectedErrorDetailsMessage: 'Please install the "Group folders" app to be able to use automatically managed folders. {htmlLink}', }, ], [ @@ -1493,7 +1493,7 @@ describe('AdminSettings.vue', () => { 'should set the project folder error message and error details when group folders app is not enabled', { error: 'The "Group folders" app is not installed', - expectedErrorDetailsMessage: 'Please install the "Group folders" app to be able to use automatically managed folders, {htmlLink}', + expectedErrorDetailsMessage: 'Please install the "Group folders" app to be able to use automatically managed folders. {htmlLink}', }, ], [ From c85c0bfb35b11d0f767a69fd6b509ab4b693160f Mon Sep 17 00:00:00 2001 From: Sagar Gurung <46086950+SagarGi@users.noreply.github.com> Date: Thu, 21 Mar 2024 12:31:06 +0545 Subject: [PATCH 2/6] Change checkbox description text (#608) Signed-off-by: sagargurung1001@gmail.com --- src/utils.js | 4 ++-- .../components/__snapshots__/AdminSettings.spec.js.snap | 4 ++-- .../__snapshots__/PersonalSettings.spec.js.snap | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/utils.js b/src/utils.js index f0e6a697a..8b4911670 100644 --- a/src/utils.js +++ b/src/utils.js @@ -54,8 +54,8 @@ export const WORKPACKAGES_SEARCH_ORIGIN = { LINK_MULTIPLE_FILES_MODAL: 'link-multiple-files-modal', } export const USER_SETTINGS = { - NAVIGATION_LINK_DESCRIPTION: t('integration_openproject', 'This check will show "OpenProject Icon" in the navigation bar to navigate directly to OpenProject instance.'), - UNIFIED_SEARCH_DESCRIPTION: t('integration_openproject', 'This check will allow to unified or global search for the OpenProject tickets from the Nextcloud.'), + NAVIGATION_LINK_DESCRIPTION: t('integration_openproject', 'Displays a link to your OpenProject instance in the Nextcloud header.'), + UNIFIED_SEARCH_DESCRIPTION: t('integration_openproject', 'Allows you to search OpenProject work packages via the universal search bar in Nextcloud.'), } export const NO_OPTION_TEXT_STATE = { diff --git a/tests/jest/components/__snapshots__/AdminSettings.spec.js.snap b/tests/jest/components/__snapshots__/AdminSettings.spec.js.snap index 1b80165cc..6f12c6b11 100644 --- a/tests/jest/components/__snapshots__/AdminSettings.spec.js.snap +++ b/tests/jest/components/__snapshots__/AdminSettings.spec.js.snap @@ -127,12 +127,12 @@ exports[`AdminSettings.vue default user configurations form should be visible wh
-

This check will show "OpenProject Icon" in the navigation bar to navigate directly to OpenProject instance.

+

Displays a link to your OpenProject instance in the Nextcloud header.

-

This check will allow to unified or global search for the OpenProject tickets from the Nextcloud.

+

Allows you to search OpenProject work packages via the universal search bar in Nextcloud.

`; diff --git a/tests/jest/components/__snapshots__/PersonalSettings.spec.js.snap b/tests/jest/components/__snapshots__/PersonalSettings.spec.js.snap index 4a3b20310..eab8dea4c 100644 --- a/tests/jest/components/__snapshots__/PersonalSettings.spec.js.snap +++ b/tests/jest/components/__snapshots__/PersonalSettings.spec.js.snap @@ -5,12 +5,12 @@ exports[`PersonalSettings.vue oAuth user settings admin and user should be able
-

This check will show "OpenProject Icon" in the navigation bar to navigate directly to OpenProject instance.

+

Displays a link to your OpenProject instance in the Nextcloud header.

-

This check will allow to unified or global search for the OpenProject tickets from the Nextcloud.

+

Allows you to search OpenProject work packages via the universal search bar in Nextcloud.

Warning, everything you type in the search bar will be sent to your OpenProject instance.

@@ -23,12 +23,12 @@ exports[`PersonalSettings.vue oAuth user settings admin and user should be able
-

This check will show "OpenProject Icon" in the navigation bar to navigate directly to OpenProject instance.

+

Displays a link to your OpenProject instance in the Nextcloud header.

-

This check will allow to unified or global search for the OpenProject tickets from the Nextcloud.

+

Allows you to search OpenProject work packages via the universal search bar in Nextcloud.

Warning, everything you type in the search bar will be sent to your OpenProject instance.

From 7da265720567c7924b3ae234dfaba2d0711acc56 Mon Sep 17 00:00:00 2001 From: "sagargurung1001@gmail.com" Date: Fri, 22 Mar 2024 14:11:59 +0545 Subject: [PATCH 3/6] Change plus icon size and remove button border Signed-off-by: sagargurung1001@gmail.com --- src/components/tab/SearchInput.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/tab/SearchInput.vue b/src/components/tab/SearchInput.vue index 9368ed093..1842428ef 100644 --- a/src/components/tab/SearchInput.vue +++ b/src/components/tab/SearchInput.vue @@ -36,7 +36,7 @@
{{ t('integration_openproject', 'Create and link a new work package') }} @@ -358,7 +358,6 @@ export default { display: flex; align-items: center; &--button { - border: 1px solid var(--color-border-dark); &--label { padding-left: 15px; font-size: 1rem; From b54d6eb7bc6e26c08bb8bd351507aadb05be4cdc Mon Sep 17 00:00:00 2001 From: Sagar Gurung <46086950+SagarGi@users.noreply.github.com> Date: Tue, 26 Mar 2024 10:03:49 +0545 Subject: [PATCH 4/6] Adjust the documentation link according to review (#611) Signed-off-by: sagargurung1001@gmail.com --- src/components/AdminSettings.vue | 3 +-- src/components/PersonalSettings.vue | 2 +- src/components/settings/SettingsTitle.vue | 17 +++++------------ tests/jest/components/AdminSettings.spec.js | 4 ++-- tests/jest/components/PersonalSettings.spec.js | 6 +++--- 5 files changed, 12 insertions(+), 20 deletions(-) diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue index d59c3011e..bf5d19fed 100644 --- a/src/components/AdminSettings.vue +++ b/src/components/AdminSettings.vue @@ -1,7 +1,7 @@