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.

Sign up for GitHub

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

Implemented filter icon color update based on the type of filters applied and the segment selected (#2zb6ver) #278

Merged
merged 14 commits into from
Nov 10, 2022
Merged

Implemented filter icon color update based on the type of filters applied and the segment selected (#2zb6ver) #278

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
cc3770b
Fixed show-default-buttons error and removed unused payload declarati…
k2maan Nov 9, 2022
0a7d616
Implemented filter button color update based on the type of filters a…
k2maan Nov 9, 2022
b7979a8
Implemented filter icon color update based on the type of filters app…
k2maan Nov 9, 2022
99d8a70
Removed commented code (#2zb6ver)
k2maan Nov 9, 2022
bac0927
Merge branch '#2zb6ver' of https://github.com/k2maan/job-manager into…
k2maan Nov 9, 2022
5348ee3
Removed commented code (#2zb6ver)
k2maan Nov 9, 2022
43ceb5e
Merge branch 'main' into #2zb6ver
adityasharma7 Nov 9, 2022
50a6c5d
Refactored by adding filters and removing function call (#2zb6ver)
k2maan Nov 9, 2022
ae24d71
Merge branch '#2zb6ver' of https://github.com/k2maan/job-manager into…
k2maan Nov 9, 2022
62e0ed6
Refactored isFilterApplied getter by using functional way to check if…
k2maan Nov 9, 2022
8bc7319
Refactored filter Icon Update by using a computed property in the com…
k2maan Nov 10, 2022
5d9df65
Refactored by code by removing getters (#2zb6ver)
k2maan Nov 10, 2022
1989edc
Refactored by code by changing computed property name (#2zb6ver)
k2maan Nov 10, 2022
8541e11
Refactored by code by changing variable name and removing type of any…
k2maan Nov 10, 2022
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
2 changes: 1 addition & 1 deletion src/store/modules/job/mutations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const mutations: MutationTree <JobState> = {
[types.JOB_PIPELINE_FILTERS_UPDATED] (state, payload){
state.pipelineFilters = payload.pipelineFilters;
},
[types.JOB_PIPELINE_FILTERS_CLEARED] (state, payload){
[types.JOB_PIPELINE_FILTERS_CLEARED] (state){
state.pipelineFilters = {
status: [],
category: [],
Expand Down
14 changes: 10 additions & 4 deletions src/views/Pipeline.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<ion-title>{{ $t("Pipeline") }}</ion-title>
<ion-buttons slot="end">
<ion-menu-button menu="end">
<ion-icon :icon="filterOutline" />
<ion-icon :icon="filterOutline" :color="updateFilterIcon" />
</ion-menu-button>
</ion-buttons>
</ion-toolbar>
Expand Down Expand Up @@ -338,7 +338,6 @@ export default defineComponent({
},
data() {
return {
selectedPinnedJobs:[],
jobFrequencyType: JSON.parse(process.env?.VUE_APP_JOB_FREQUENCY_TYPE as string) as any,
jobEnums: {
...JSON.parse(process.env?.VUE_APP_ODR_JOB_ENUMS as string) as any,
Expand Down Expand Up @@ -371,7 +370,14 @@ export default defineComponent({
getPinnedJobs: 'user/getPinnedJobs',
currentJob: 'job/getCurrentJob',
pipelineFilters: 'job/getPipelineFilters',
})
}),
updateFilterIcon: function() {
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
updateFilterIcon: function() {
filterIconColor: function() {

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done sir

const pipelineFilters = JSON.parse(JSON.stringify(this.pipelineFilters));
if(this.segmentSelected !== 'history') {
delete pipelineFilters.status;
}
return Object.values(pipelineFilters as any).some((filters: any) => filters?.length > 0) ? 'secondary' : '';
},
},
methods : {
isPinnedJobSelected(jobEnumId: any) {
Expand Down Expand Up @@ -571,7 +577,7 @@ export default defineComponent({
}
this.getPendingJobs();
}
}
},
},
async created() {
this.getPendingJobs();
Expand Down