Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[OP#41487] Replace icons for no connection and add link #90

Merged
merged 5 commits into from
Mar 25, 2022

Conversation

@SwikritiT SwikritiT changed the title Replace svgs Replace icons for no connection and add link Mar 23, 2022
@SwikritiT SwikritiT self-assigned this Mar 23, 2022
@SwikritiT SwikritiT marked this pull request as ready for review March 23, 2022 10:07
src/components/OAuthConnectButton.vue Outdated Show resolved Hide resolved
src/components/tab/EmptyContent.vue Outdated Show resolved Hide resolved
src/components/tab/EmptyContent.vue Show resolved Hide resolved
src/components/tab/EmptyContent.vue Outdated Show resolved Hide resolved
@SwikritiT SwikritiT changed the title Replace icons for no connection and add link [OP#41487] Replace icons for no connection and add link Mar 24, 2022
exports[`EmptyContent.vue Test content title shows the correct empty message depending on states if the request url is valid 6`] = `
<div class="empty-content--message">
<div class="empty-content--message--title">
invalid state
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this the correct message @SwikritiT?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, it is. If the state is something other than the specified. If you have any better suggestion I can change the message

emptyContentMessage() {
if (this.state === 'no-token') {
return t('integration_openproject', 'No OpenProject account connected')
} else if (this.state === 'connection-error') {
return t('integration_openproject', 'Error connecting to OpenProject')
} else if (this.state === 'failed-fetching-workpackages') {
return t('integration_openproject', 'Could not fetch work packages from OpenProject')
} else if (this.state === 'error') {
return t('integration_openproject', 'Unexpected Error')
} else if (this.state === 'ok') {
return t('integration_openproject', 'No workspaces linked yet, search for work package to add!')
}
return 'invalid state'

Copy link
Contributor

@kiranparajuli589 kiranparajuli589 Mar 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh yes, it's for the last else clause. 👍 I think we never reach this state. Still, we can leave the check for the error state and handle everything else as an error state.

			if (this.state === 'no-token') {
				return t('integration_openproject', 'No OpenProject account connected')
			} else if (this.state === 'connection-error') {
				return t('integration_openproject', 'Error connecting to OpenProject')
			} else if (this.state === 'failed-fetching-workpackages') {
				return t('integration_openproject', 'Could not fetch work packages from OpenProject')
			} else if (this.state === 'ok') {
				return t('integration_openproject', 'No workspaces linked yet, search for work package to add!')
			}
			return return t('integration_openproject', 'Unexpected Error')

Copy link
Collaborator Author

@SwikritiT SwikritiT Mar 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds nice. Did it in the latest commit

Signed-off-by: Swikriti Tripathi <swikriti808@gmail.com>
Signed-off-by: Swikriti Tripathi <swikriti808@gmail.com>
Signed-off-by: Swikriti Tripathi <swikriti808@gmail.com>
Signed-off-by: Swikriti Tripathi <swikriti808@gmail.com>
@github-actions
Copy link

JS Code Coverage

Coverage after merging change-no-con-svg into master will be
50.81%
Coverage Report
FileStmtsBranchesFuncsLinesUncovered Lines
src
   utils.js8.33%0%0%14.29%3–9, 9
src/components
   AdminSettings.vue40.91%100%16.67%50%73–75, 79, 86–87, 89, 92
   OAuthConnectButton.vue93.10%100%85.71%95.45%45
   PersonalSettings.vue37.14%30%33.33%42.11%100–101, 101, 101, 104–105, 105, 105, 108–109, 109, 109, 112, 115–116, 118–119, 119–121, 121, 121, 121–122, 127–128, 128, 128, 133, 139, 87–90, 96–97
src/components/settings
   SettingsTitle.vue0%100%0%0%14
src/components/tab
   EmptyContent.vue100%100%100%100%
   SearchInput.vue60.87%50%64.29%62.50%105, 105, 105–106, 108, 112–116, 121, 123–126, 130, 137, 148, 164, 66, 75–78, 85, 85–87, 89, 89–90
   WorkPackage.vue100%100%100%100%
src/utils
   workpackageHelper.js95.12%95.24%100%94.12%11, 19
src/views
   Dashboard.vue0%0%0%0%100–101, 101–102, 104, 107, 112, 112, 112–113, 115, 121, 125–126, 134, 137, 141–143, 145, 148–149, 152–153, 153–154, 158–159, 159–160, 162, 164–165, 165, 165, 165, 165–167, 167, 167, 167, 167–169, 172, 177, 177, 177, 179–180, 180, 180–181, 183, 183–185, 189, 193, 196, 196, 196, 199, 199, 199, 204, 207, 207, 207, 214, 217, 217, 217, 222, 222, 222, 227, 227, 227, 23, 232, 235, 238, 24, 241, 241, 241, 244, 244, 244, 247, 25, 250, 253, 26–31, 48, 55, 55, 62, 65–66, 78–79, 79, 79, 82, 85, 85, 85–87, 87, 87–89, 89–90, 92, 95, 95, 95–97, 97, 97–99, 99, 99
   ProjectsTab.vue94.55%100%83.33%94.12%88–89

@github-actions
Copy link

PHP Code Coverage

Coverage after merging change-no-con-svg into master will be
50.65%
Coverage Report
FileStmtsBranchesFuncsLinesUncovered Lines
lib/AppInfo
   Application.php0%100%0%0%49, 51–52, 54–55, 59–60, 63, 70, 74–77, 79–84, 95, 99
lib/BackgroundJob
   CheckNotifications.php0%100%0%0%48, 50, 52–53, 61–62
lib/Controller
   ConfigController.php67.47%100%60%67.95%101–102, 104, 115–116, 118, 213–216, 218–219, 222, 81–82, 84, 86–88, 90–95
   OpenProjectAPIController.php77.46%100%75%77.78%163, 180–181, 184, 187, 192, 194–199, 201, 90
lib/Dashboard
   OpenProjectWidget.php0%100%0%0%106–107, 109–113, 61–64, 71, 78, 85, 92, 99
lib/Exception
   OpenprojectErrorException.php100%100%100%100%
   OpenprojectResponseException.php0%100%0%0%16
lib/Listener
   LoadSidebarScript.php0%100%0%0%59–61, 65–66, 68, 70, 72–74, 76, 78–82
lib/Notification
   Notifier.php0%100%0%0%100–104, 109–110, 112, 114, 47–50, 60, 69, 80, 82, 85, 87–92, 95, 97
lib/Search
   OpenProjectSearchProvider.php0%100%0%0%102, 109–110, 113–116, 118–119, 123–125, 127–128, 130–132, 135–136, 138–139, 143–144, 146–148, 154–155, 157, 166, 174–180, 189–194, 203, 71–75, 82, 89, 97, 99
   OpenProjectSearchResultEntry.php100%100%100%100%
lib/Service
   OpenProjectAPIService.php70.21%100%72.22%70.05%106–107, 116–124, 126–135, 137–138, 141–142, 158–162, 172–173, 175–179, 181, 190–194, 358, 375–376, 378, 393–396, 398, 464–465, 472, 475–478, 480, 486, 490–492, 635
lib/Settings
   Admin.php0%100%0%0%25–26, 33–35, 37, 42–43, 47, 51
   AdminSection.php0%100%0%0%19–20, 29, 39, 48, 55
   Personal.php84%100%50%90.48%75, 79
   PersonalSection.php0%100%0%0%19–20, 29, 39, 48, 55

Signed-off-by: Swikriti Tripathi <swikriti808@gmail.com>
Copy link
Contributor

@kiranparajuli589 kiranparajuli589 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@individual-it individual-it merged commit 89bf9cb into master Mar 25, 2022
@delete-merged-branch delete-merged-branch bot deleted the change-no-con-svg branch March 25, 2022 08:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants