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

update: add reserTable[WTEL-5711](https://webitel.atlassian.net/brows… #192

Merged
merged 2 commits into from
Dec 13, 2024
Merged

update: add reserTable[WTEL-5711](https://webitel.atlassian.net/brows… #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae82f1d
update: add reserTable[WTEL-5711](https://webitel.atlassian.net/brows…
Lera24 Dec 13, 2024
27ded6b
@24.12.22 update webitel/ui-sdk and add resetState method[WTEL-5711](…
Lera24 Dec 13, 2024
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
8 changes: 4 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@vuelidate/core": "^2.0.3",
"@vuelidate/validators": "^2.0.4",
"@vueuse/core": "^11.0.3",
"@webitel/ui-sdk": "^24.12.20",
"@webitel/ui-sdk": "^24.12.22",
"axios": "^1.7.7",
"deep-equal": "^2.2.1",
"dompurify": "^3.1.2",
Expand Down
4 changes: 3 additions & 1 deletion src/modules/configuration/modules/lookups/modules/slas/components/the-slas.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ import FilterPagination from '@webitel/ui-sdk/src/modules/Filters/components/fil
import DeleteConfirmationPopup
from '@webitel/ui-sdk/src/modules/DeleteConfirmationPopup/components/delete-confirmation-popup.vue';
import { useTableFilters } from '@webitel/ui-sdk/src/modules/Filters/composables/useTableFilters.js';
import { useTableStore } from '@webitel/ui-sdk/src/modules/TableStoreModule/composables/useTableStore.js';
import { useTableStore } from '@webitel/ui-sdk/src/store/new/modules/tableStoreModule/useTableStore.js';
import { useTableEmpty } from '@webitel/ui-sdk/src/modules/TableComponentModule/composables/useTableEmpty.js';
import filters from '../modules/filters/store/filters.js';

Expand Down Expand Up @@ -159,6 +159,7 @@ const {
sort,
setSelected,
onFilterEvent,
resetState,
} = useTableStore(baseNamespace);

const {
Expand All @@ -178,6 +179,7 @@ restoreFilters();

onUnmounted(() => {
flushSubscribers();
resetState();
});

const path = computed(() => [
Expand Down
5 changes: 4 additions & 1 deletion ...tion/modules/lookups/modules/slas/modules/conditions/components/opened-sla-conditions.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ import {
} from '@webitel/ui-sdk/src/modules/DeleteConfirmationPopup/composables/useDeleteConfirmationPopup';
import FilterPagination from '@webitel/ui-sdk/src/modules/Filters/components/filter-pagination.vue';
import { useTableFilters } from '@webitel/ui-sdk/src/modules/Filters/composables/useTableFilters.js';
import { useCardStore, useTableStore } from '@webitel/ui-sdk/store';
import { useCardStore } from '@webitel/ui-sdk/store';
import { useTableStore } from '@webitel/ui-sdk/src/store/new/modules/tableStoreModule/useTableStore.js';
import { onUnmounted } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRoute, useRouter } from 'vue-router';
Expand Down Expand Up @@ -166,6 +167,7 @@ const {
sort,
setSelected,
onFilterEvent,
resetState,
} = useTableStore(namespace);

const {
Expand All @@ -185,6 +187,7 @@ restoreFilters();

onUnmounted(() => {
flushSubscribers();
resetState();
});

const {
Expand Down
14 changes: 12 additions & 2 deletions ...modules/configuration/modules/lookups/modules/slas/modules/conditions/store/conditions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,16 @@ import ConditionsAPI from '../api/conditions.js';
import filters from '../modules/filters/store/filters.js';
import headers from './_internals/headers.js';

const resettableItemState = {
const resetTableState = {
dataList: [],
selected: [],
error: {},
isLoading: false,
isNextPage: false,
};

const resetCardState = {
itemId: '',
itemInstance: {
},
};
Expand All @@ -26,6 +35,7 @@ const api = createApiStoreModule({
const table = createTableStoreModule({
state: {
headers,
_resettable: resetTableState,
},
getters,
modules: {
Expand All @@ -35,7 +45,7 @@ const table = createTableStoreModule({
});

const card = createCardStoreModule({
state: { _resettable: resettableItemState },
state: { _resettable: resetCardState },
getters,
modules: {
api,
Expand Down
17 changes: 12 additions & 5 deletions src/modules/configuration/modules/lookups/modules/slas/store/slas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,16 @@ import headers from './_internals/headers';
import filters from '../modules/filters/store/filters';
import conditions from '../modules/conditions/store/conditions';

const resettableState = {
const resetTableState = {
dataList: [],
selected: [],
error: {},
isLoading: false,
isNextPage: false,
};

const resetCardState = {
itemId: '',
itemInstance: {
name: '',
description: '',
Expand All @@ -28,17 +37,15 @@ const api = createApiStoreModule({
});

const table = createTableStoreModule({
state: {
headers,
},
state: { _resettable: resetTableState, headers },
modules: {
filters,
api,
},
});

const card = createCardStoreModule({
state: { _resettable: resettableState },
state: { _resettable: resetCardState },
modules: {
api,
conditions,
Expand Down
4 changes: 3 additions & 1 deletion src/modules/configuration/modules/lookups/modules/sources/components/the-sources.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,11 @@ import FilterPagination from '@webitel/ui-sdk/src/modules/Filters/components/fil
import DeleteConfirmationPopup
from '@webitel/ui-sdk/src/modules/DeleteConfirmationPopup/components/delete-confirmation-popup.vue';
import { useTableFilters } from '@webitel/ui-sdk/src/modules/Filters/composables/useTableFilters.js';
import { useTableStore } from '@webitel/ui-sdk/src/modules/TableStoreModule/composables/useTableStore.js';
import { computed, onUnmounted } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router';
import { useTableEmpty } from '@webitel/ui-sdk/src/modules/TableComponentModule/composables/useTableEmpty.js';
import { useTableStore } from '@webitel/ui-sdk/src/store/new/modules/tableStoreModule/useTableStore.js';
import filters from '../modules/filters/store/filters.js';

const baseNamespace = 'configuration/lookups/sources';
Expand Down Expand Up @@ -158,6 +158,7 @@ const {
sort,
setSelected,
onFilterEvent,
resetState,
} = useTableStore(baseNamespace);

const {
Expand All @@ -177,6 +178,7 @@ restoreFilters();

onUnmounted(() => {
flushSubscribers();
resetState();
});

const path = computed(() => [
Expand Down
13 changes: 11 additions & 2 deletions src/modules/configuration/modules/lookups/modules/sources/store/sources.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,15 @@ import SourcesAPI from '../api/sources.js';
import headers from './_internals/headers';
import filters from '../modules/filters/store/filters';

const resettableState = {
const resetTableState = {
dataList: [],
selected: [],
error: {},
isLoading: false,
isNextPage: false,
};

const resetCardState = {
itemInstance: {
name: '',
description: '',
Expand All @@ -25,6 +33,7 @@ const api = createApiStoreModule({
const table = createTableStoreModule({
state: {
headers,
_resettable: resetTableState,
},
modules: {
filters,
Expand All @@ -33,7 +42,7 @@ const table = createTableStoreModule({
});

const card = createCardStoreModule({
state: { _resettable: resettableState },
state: { _resettable: resetCardState },
modules: {
api,
},
Expand Down
Loading