Skip to content

Commit 138d4ff

Browse files
esuneesune
authored
Merge pull request #261 from bcgov/remaining-pinia-stores
Migrate Remaining Pinia Stores
2 parents 2aa729d + 57204a1 commit 138d4ff

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+724
-389
lines changed

‎components.d.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,29 +59,40 @@ declare module 'vue' {
5959
VChip: typeof import('vuetify/lib')['VChip']
6060
VCol: typeof import('vuetify/lib')['VCol']
6161
VContainer: typeof import('vuetify/lib')['VContainer']
62+
VDataTable: typeof import('vuetify/lib')['VDataTable']
63+
VDatePicker: typeof import('vuetify/lib')['VDatePicker']
6264
VDialog: typeof import('vuetify/lib')['VDialog']
65+
VDivider: typeof import('vuetify/lib')['VDivider']
6366
VExpansionPanel: typeof import('vuetify/lib')['VExpansionPanel']
6467
VExpansionPanelContent: typeof import('vuetify/lib')['VExpansionPanelContent']
6568
VExpansionPanelHeader: typeof import('vuetify/lib')['VExpansionPanelHeader']
6669
VExpansionPanels: typeof import('vuetify/lib')['VExpansionPanels']
6770
VFooter: typeof import('vuetify/lib')['VFooter']
71+
VForm: typeof import('vuetify/lib')['VForm']
6872
VIcon: typeof import('vuetify/lib')['VIcon']
6973
VList: typeof import('vuetify/lib')['VList']
7074
VListItem: typeof import('vuetify/lib')['VListItem']
7175
VListItemAction: typeof import('vuetify/lib')['VListItemAction']
7276
VListItemContent: typeof import('vuetify/lib')['VListItemContent']
7377
VListItemGroup: typeof import('vuetify/lib')['VListItemGroup']
7478
VMain: typeof import('vuetify/lib')['VMain']
79+
VMenu: typeof import('vuetify/lib')['VMenu']
7580
VNavigationDrawer: typeof import('vuetify/lib')['VNavigationDrawer']
7681
VProgressCircular: typeof import('vuetify/lib')['VProgressCircular']
7782
VProgressLinear: typeof import('vuetify/lib')['VProgressLinear']
7883
VRow: typeof import('vuetify/lib')['VRow']
7984
VScrollXTransition: typeof import('vuetify/lib')['VScrollXTransition']
85+
VSelect: typeof import('vuetify/lib')['VSelect']
8086
VSimpleCheckbox: typeof import('vuetify/lib')['VSimpleCheckbox']
8187
VSimpleTable: typeof import('vuetify/lib')['VSimpleTable']
8288
VSkeletonLoader: typeof import('vuetify/lib')['VSkeletonLoader']
8389
VSpacer: typeof import('vuetify/lib')['VSpacer']
90+
VTab: typeof import('vuetify/lib')['VTab']
91+
VTabs: typeof import('vuetify/lib')['VTabs']
92+
VTextarea: typeof import('vuetify/lib')['VTextarea']
8493
VTextField: typeof import('vuetify/lib')['VTextField']
94+
VTimeline: typeof import('vuetify/lib')['VTimeline']
95+
VTimelineItem: typeof import('vuetify/lib')['VTimelineItem']
8596
VToolbar: typeof import('vuetify/lib')['VToolbar']
8697
VToolbarItems: typeof import('vuetify/lib')['VToolbarItems']
8798
VToolbarTitle: typeof import('vuetify/lib')['VToolbarTitle']

‎src/components/about/OrgBookData.vue‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,12 @@
5151
import i18n from "@/i18n";
5252
import { ICredentialType } from "@/interfaces/api/v2/credential-type.interface";
5353
import { unwrapTranslations } from "@/utils/entity";
54-
import { mapGetters } from "vuex";
54+
import { useCredentialTypeState } from "@/stores";
55+
import { mapState } from "pinia";
5556
5657
export default {
5758
computed: {
58-
...mapGetters(["credentialTypesByIssuer"]),
59+
...mapState(useCredentialTypeState, ["credentialTypesByIssuer"]),
5960
},
6061
methods: {
6162
formattedDescription(type: ICredentialType): string {

‎src/components/contact/ContactForm.vue‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,7 @@
121121

122122
<script lang="ts">
123123
import { Component, Vue } from "vue-property-decorator";
124-
import { mapActions, mapGetters } from "vuex";
125-
import { useAppState, useContactState } from "@/stores"
124+
import { useAppState, useContactState, useCredentialState, useCredentialTypeState, useLikeState } from "@/stores"
126125
import { mapActions as pmapActions, mapState } from "pinia";
127126
128127
import router from "@/router";
@@ -188,10 +187,8 @@ export default {
188187
189188
},
190189
computed: {
191-
...mapGetters({
192-
credentialTypes: "credentialTypes",
193-
getLikeStatus: "getLikeStatus"
194-
}),
190+
...mapState(useCredentialTypeState, ["credentialTypes"]),
191+
...mapState(useLikeState, ["getLikeStatus"]),
195192
...mapState(useAppState, {loading: "getLoading"}),
196193
requestTypes: function(): Array<{ text: string; value: string }> {
197194
return Object.keys(contactReason).map((key) => ({

‎src/components/entity/CredentialItem.vue‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,8 @@
9999
<script lang="ts">
100100
import { Component, Prop, Vue } from "vue-property-decorator";
101101
import "@/filters/date.filter";
102-
import { mapGetters } from "vuex";
103102
import { mapState } from "pinia";
104-
import { useTopicState } from "@/stores";
103+
import { useTopicState, useIconState, useCredentialTypeState } from "@/stores";
105104
import { ICredentialDisplayType } from "@/interfaces/api/v4/credential.interface";
106105
import { selectFirstAttrItem } from "@/utils/attribute";
107106
import i18n from "@/i18n/index";
@@ -114,11 +113,10 @@ import { isExpired, toTranslationFormat } from "@/utils/entity";
114113
115114
@Component({
116115
computed: {
117-
...mapGetters([
118-
"mdiOpenInNew",
119-
"mdiShieldCheckOutline",
116+
...mapState(useCredentialTypeState, [
120117
"credentialTypes",
121118
]),
119+
...mapState(useIconState, ["mdiOpenInNew","mdiShieldCheckOutline"]),
122120
...mapState(useTopicState, ["selectedTopic"])
123121
},
124122
})

‎src/components/entity/EntityResult.vue‎

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -438,9 +438,8 @@
438438
<script lang="ts">
439439
import { Component, Vue, Watch } from "vue-property-decorator";
440440
import { VuetifyGoToTarget } from "vuetify/types/services/goto";
441-
import { mapActions, mapGetters } from "vuex";
442441
import { mapActions as pmapActions, mapState } from "pinia";
443-
import { useAppState, useTopicState } from "@/stores";
442+
import { useAppState, useTopicState, useEntityState, useEntityDescState, useIconState, useCredentialTypeState } from "@/stores";
444443
import moment from "moment";
445444
446445
import {
@@ -496,23 +495,14 @@ export default {
496495
};
497496
},
498497
computed: {
499-
...mapGetters({
498+
...mapState(useCredentialTypeState, {
500499
credentialTypes: "credentialTypes",
501-
entityDesc: "entityDesc",
502-
getEntityFilters: "getEntityFilters",
503-
getRelationships: "getRelationships",
504-
getScrollY: "getScrollY",
505-
mdiArrowUp: "mdiArrowUp",
506-
mdiArrowDown: "mdiArrowDown",
507-
mdiArrowLeft: "mdiArrowLeft",
508-
mdiMapMarker: "mdiMapMarker",
509-
mdiChevronLeft: "mdiChevronLeft",
510-
mdiChevronRight: "mdiChevronRight",
511-
mdiCircleMedium: "mdiCircleMedium",
512-
mdiInformationOutline: "mdiInformationOutline",
513500
}),
501+
...mapState(useIconState, ["mdiArrowUp", "mdiArrowDown", "mdiArrowLeft", "mdiMapMarker", "mdiChevronLeft", "mdiChevronRight", "mdiCircleMedium", "mdiInformationOutline"]),
514502
...mapState(useAppState, { loading: "getLoading" }),
515503
...mapState(useTopicState, ["selectedTopic", "selectedTopicFullCredentialSet"]),
504+
...mapState(useEntityState, ["getScrollY","getRelationships", "getEntityFilters"]),
505+
...mapState(useEntityDescState, ["entityDesc"]),
516506
hasAnyRelationships: function (): boolean {
517507
return (
518508
this.businessAsRelationship?.length > 0 ||
@@ -717,16 +707,13 @@ export default {
717707
718708
},
719709
methods: {
720-
...mapActions({
710+
...pmapActions(useCredentialTypeState, {
721711
fetchCredentialTypes: "fetchCredentialTypes",
722-
setCredentialType: "setCredentialType",
723-
setEntityDesc: "setEntityDesc",
724-
setRegistrationType: "setRegistrationType",
725-
setIssuers: "setIssuers",
726-
fetchRelationships: "fetchRelationships",
727712
}),
728713
...pmapActions(useAppState, ["setLoading"]),
729714
...pmapActions(useTopicState, ["fetchFormattedIdentifiedTopic", "fetchTopicFullCredentialSet"]),
715+
...pmapActions(useEntityState, ["fetchRelationships", "setIssuers", "setCredentialType", "setRegistrationType",]),
716+
...pmapActions(useEntityDescState, ["setEntityDesc"]),
730717
credOrRelationshipToDisplay,
731718
getRelationshipName,
732719
getCredentialLabel,

‎src/components/entity/credentialDetail/CredentialDetail.vue‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,8 @@
120120

121121
<script lang="ts">
122122
import { Component, Vue } from "vue-property-decorator";
123-
import { mapActions, mapGetters } from "vuex";
124123
import { mapActions as pmapActions, mapState } from "pinia"
125-
import { useCredentialState, useTopicState, useAppState } from "@/stores";
124+
import { useCredentialState, useTopicState, useAppState, useIconState } from "@/stores";
126125
import { ICredentialSet } from "@/interfaces/api/v2/credential-set.interface";
127126
import { ICredentialProof } from "@/interfaces/api/v3/credential-verified.interface";
128127
import { IFormattedTopic } from "@/interfaces/api/v2/topic.interface";
@@ -143,7 +142,7 @@ interface Data {
143142
BackTo,
144143
},
145144
computed: {
146-
...mapGetters([
145+
...mapState(useIconState, [
147146
"mdiArrowLeft",
148147
"mdiShieldCheckOutline",
149148
"mdiCheckBold",

‎src/components/entity/filter/EntityFilterChips.vue‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
</template>
2323

2424
<script lang="ts">
25-
import { mapActions, mapGetters } from "vuex";
25+
import { mapState, mapActions as pmapActions } from "pinia";
26+
import { useEntityState, useIconState } from "@/stores";
2627
import { IEntityFilter } from "@/interfaces/entity-filter.interface";
2728
2829
export interface EntityChips {
@@ -31,10 +32,8 @@ export interface EntityChips {
3132
}
3233
export default {
3334
computed: {
34-
...mapGetters({
35-
getEntityFilters: "getEntityFilters",
36-
mdiClose: "mdiClose"
37-
}),
35+
...mapState(useIconState, ["mdiClose"]),
36+
...mapState(useEntityState, ["getEntityFilters"]),
3837
activeEntityFilters: function (): EntityChips[] {
3938
let chips: EntityChips[] = [];
4039
Object.keys(this.getEntityFilters).forEach((key) => {
@@ -70,9 +69,7 @@ export default {
7069
},
7170
},
7271
methods: {
73-
...mapActions({
74-
toggleEntityFilter: "toggleEntityFilter"
75-
}),
72+
...pmapActions(useEntityState, ["toggleEntityFilter"]),
7673
}
7774
}
7875
</script>

‎src/components/entity/filter/EntityFilterDialog.vue‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@
3939
</template>
4040

4141
<script lang="ts">
42-
import { mapGetters } from "vuex";
4342
import EntityFilterFacetPanels from "@/components/entity/filter/EntityFilterFacetPanels.vue";
44-
import { useAppState } from "@/stores/app"
43+
import { useAppState, useIconState } from "@/stores"
4544
import { mapState } from "pinia";
4645
4746
interface Data {
@@ -54,7 +53,7 @@ export default {
5453
};
5554
},
5655
computed: {
57-
...mapGetters(["mdiFilterOutline", "mdiClose"]),
56+
...mapState(useIconState, ["mdiFilterOutline", "mdiClose"]),
5857
...mapState(useAppState, {loading: "getLoading"})
5958
}
6059
}

‎src/components/entity/filter/EntityFilterFacetPanels.vue‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,8 @@
235235
</template>
236236

237237
<script lang="ts">
238-
import { mapActions, mapGetters } from "vuex";
238+
import { mapState, mapActions as pmapActions } from "pinia";
239+
import { useEntityState, useIconState } from "@/stores";
239240
240241
import {
241242
IEntityFacetField,
@@ -273,21 +274,20 @@ export default {
273274
};
274275
},
275276
computed: {
276-
...mapGetters({
277-
searchTopicFacets: "searchTopicFacets",
278-
getAuthorities: "getAuthorities",
279-
getCredentialTypes: "getCredentialTypes",
280-
getRegistrationTypes: "getRegistrationTypes",
281-
getEntityFilters: "getEntityFilters",
277+
...mapState(useIconState, {
282278
mdiCalendar: "mdiCalendar",
283279
mdiInformationOutline: "mdiInformationOutline",
284280
}),
281+
...mapState(useEntityState, [
282+
"getAuthorities",
283+
"getCredentialTypes",
284+
"getRegistrationTypes",
285+
"getEntityFilters",
286+
])
285287
},
286288
methods: {
287289
isEntityFilterActive,
288-
...mapActions({
289-
setFilter: "setFilter"
290-
}),
290+
...pmapActions(useEntityState, ["setFilter"]),
291291
toggleShowExpired(newVal: boolean): void {
292292
var currFilters = { ...this.getEntityFilters };
293293
currFilters.show_expired = !newVal;

‎src/components/entity/filter/EntityFilterFacets.vue‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@
4646
</template>
4747

4848
<script lang="ts">
49-
import { mapGetters, mapActions } from "vuex";
49+
import { mapState, mapActions as pmapActions} from "pinia";
50+
import { useEntityState } from "@/stores";
5051
import {
5152
IEntityFacetField,
5253
IEntityFilter,
@@ -56,10 +57,10 @@ import { isEntityFilterActive, toTranslationFormat } from "@/utils/entity";
5657
5758
export default {
5859
computed: {
59-
...mapGetters(["getEntityFilters"]),
60+
...mapState(useEntityState, ["getEntityFilters"]),
6061
},
6162
methods: {
62-
...mapActions(["toggleEntityFilter"]),
63+
...pmapActions(useEntityState, ["toggleEntityFilter"]),
6364
isEntityFilterActive,
6465
toTranslationFormat
6566
},

0 commit comments

Comments
 (0)