Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
0215e92
feat(fragments): add event grouping pattern fragment
e11sy Mar 16, 2025
9e7ddb6
feat(mutations): add project mutations
e11sy Mar 16, 2025
6b9a2bd
feat(mutations): add mutations for crud event grouping patterns
e11sy Mar 16, 2025
961246a
imp(mutations): update workspace query to include eventGroupingPatterns
e11sy Mar 16, 2025
cec21c2
feat(store): add store action types
e11sy Mar 16, 2025
0434727
feat(store): add api and mutations calls
e11sy Mar 16, 2025
0ef29f8
feat(types): add event grouping patterns
e11sy Mar 16, 2025
b9508ef
feat(types): add eventGroupingPattern optional field to project
e11sy Mar 16, 2025
ed86f5b
feat(router): add new patterns route for project settings
e11sy Mar 16, 2025
0f6a75e
feat(components): add link to patterns page in project settings layout
e11sy Mar 16, 2025
ee9bc07
feat(components): add eventGroupintPattern page component
e11sy Mar 16, 2025
2b4a585
chore(i18n): update dictionaries
e11sy Mar 16, 2025
130a0e5
fix(router): fix link to the component
e11sy Mar 16, 2025
3d1051c
fix(import): fix build
e11sy Mar 16, 2025
50a0f10
fix(graphql): remove redundant fragment
e11sy Mar 16, 2025
abd58ca
chore(): lint fix
e11sy Mar 16, 2025
98c4ad4
imp(components): add new pattern validation on create/update
e11sy Mar 16, 2025
7b786ff
imp(components): improve new pattern validation
e11sy Mar 16, 2025
a7dd26c
imp(mutations): add names for notifications and patterns mutations
e11sy Mar 16, 2025
eaeca4e
imp(): imp codestyle
e11sy Mar 16, 2025
770c5b5
fix(): lint fix
e11sy Mar 16, 2025
fde601e
fix(): remove redundant chars
e11sy Mar 16, 2025
d6b5496
fix(projects): do not use callOld
e11sy Mar 16, 2025
5e2fd19
imp(components): rewrite eventGroupingPattern settings using BEM
e11sy Mar 16, 2025
b9117cf
imp(components): check regexps to be safe
e11sy Mar 16, 2025
f505d37
imp(): move regex validation to the separate method
e11sy Mar 16, 2025
1fc3fab
fix(): lint fix
e11sy Mar 16, 2025
4048b40
fix(api): fix call method usage
e11sy Mar 18, 2025
888d5ac
imp(patterns): empty improve empty pattern state display
e11sy Mar 20, 2025
643e12f
imp(patters): translate notificatoins
e11sy Mar 20, 2025
07fb370
fix(patterns): stringify TranslateResult
e11sy Mar 20, 2025
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
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@
"vue-template-compiler": "^2.6.11",
"vue-unique-id": "^3.2.1",
"vuex": "^3.1.2",
"vuex-persistedstate": "^3.0.1"
"vuex-persistedstate": "^3.0.1",
"safe-regex": "^2.1.0"
},
"devDependencies": {
"@storybook/addon-actions": "^6.3.12",
Expand Down
51 changes: 51 additions & 0 deletions src/api/projects/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ import {
MUTATION_CREATE_PROJECT_NOTIFY_RULE,
MUTATION_UPDATE_PROJECT_NOTIFY_RULE,
MUTATION_REMOVE_PROJECT_NOTIFY_RULE,
MUTATION_CREATE_PROJECT_PATTERN,
MUTATION_UPDATE_PROJECT_PATTERN,
MUTATION_REMOVE_PROJECT_PATTERN,
MUTATION_REMOVE_PROJECT,
MUTATION_TOGGLE_ENABLED_STATE_OF_A_PROJECT_NOTIFY_RULE,
QUERY_CHART_DATA, MUTATION_GENERATE_NEW_INTEGRATION_TOKEN
Expand Down Expand Up @@ -115,6 +118,54 @@ export async function updateProjectNotificationsRule(payload) {
})).updateProjectNotificationsRule;
}

/**
* Send request for creation new project event grouping pattern
*
* @param {AddProjectEventGroupingPatternPayload} payload - add pattern payload
* @returns {Promise<ProjectEventGroupingPattern>} - created pattern
*/
export async function addEventGroupingPattern(payload) {
const response = (await api.call(MUTATION_CREATE_PROJECT_PATTERN, {
input: payload,
}));

const addedPattern = response.data.createProjectEventGroupingPattern;

return addedPattern;
}

/**
* Send request for updating specific project event grouping pattern
*
* @param {UpdateProjectEventGroupingPatternPayload} payload - update pattern payload
* @returns {Promise<ProjectEventGroupingPattern>} - updated pattern
*/
export async function updateEventGroupingPattern(payload) {
const response = await api.call(MUTATION_UPDATE_PROJECT_PATTERN, {
input: payload,
});

const updatedPattern = response.data.updateProjectEventGroupingPattern;

return updatedPattern;
}

/**
* Send request for removing specific project event grouping pattern
*
* @param {ProjectEventGroupingPatternPointer} payload - remove pattern payload
* @returns {Promise<ProjectEventGroupingPattern>} - removed pattern
*/
export async function removeEventGroupingPattern(payload) {
const response = await api.call(MUTATION_REMOVE_PROJECT_PATTERN, {
input: payload,
});

const removedPattern = response.data.removeProjectEventGroupingPattern;

return removedPattern;
}

/**
* Send request for removing specific project notifications rule
*
Expand Down
44 changes: 40 additions & 4 deletions src/api/projects/queries.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export const MUTATION_UPDATE_LAST_VISIT = `

// language=GraphQL
export const MUTATION_CREATE_PROJECT_NOTIFY_RULE = `
mutation ( $input: CreateProjectNotificationsRuleInput! ){
mutation createProjectNotificationsRule( $input: CreateProjectNotificationsRuleInput! ){
createProjectNotificationsRule(
input: $input
) {
Expand All @@ -98,7 +98,7 @@ export const MUTATION_CREATE_PROJECT_NOTIFY_RULE = `

// language=GraphQL
export const MUTATION_UPDATE_PROJECT_NOTIFY_RULE = `
mutation ( $input: UpdateProjectNotificationsRuleInput! ){
mutation updateProjectNotificationsRule( $input: UpdateProjectNotificationsRuleInput! ){
updateProjectNotificationsRule(
input: $input
) {
Expand All @@ -111,7 +111,7 @@ export const MUTATION_UPDATE_PROJECT_NOTIFY_RULE = `

// language=GraphQL
export const MUTATION_REMOVE_PROJECT_NOTIFY_RULE = `
mutation ( $input: ProjectNotificationRulePointer! ) {
mutation removeProjectNotificationsRule( $input: ProjectNotificationRulePointer! ) {
deleteProjectNotificationsRule(
input: $input
) {
Expand All @@ -122,6 +122,42 @@ export const MUTATION_REMOVE_PROJECT_NOTIFY_RULE = `
${PROJECT_NOTIFICATIONS_RULE_FRAGMENT}
`;

// language=GraphQL
export const MUTATION_CREATE_PROJECT_PATTERN = `
mutation createProjectEventGroupingPattern( $input: CreateProjectEventGroupingPatternInput! ){
createProjectEventGroupingPattern(
input: $input
) {
id
pattern
}
}
`;

// language=GraphQL
export const MUTATION_UPDATE_PROJECT_PATTERN = `
mutation updateProjectEventGroupingPattern( $input: UpdateProjectEventGroupingPatternInput! ){
updateProjectEventGroupingPattern(
input: $input
) {
id
pattern
}
}
`;

// language=GraphQL
export const MUTATION_REMOVE_PROJECT_PATTERN = `
mutation removeProjectEventGroupingPattern( $input: RemoveProjectEventGroupingPatternInput! ){
removeProjectEventGroupingPattern(
input: $input
) {
id
pattern
}
}
`;

// language=GraphQL
export const MUTATION_REMOVE_PROJECT = `
mutation removeProject($projectId: ID!) {
Expand All @@ -131,7 +167,7 @@ export const MUTATION_REMOVE_PROJECT = `

// language=GraphQL
export const MUTATION_TOGGLE_ENABLED_STATE_OF_A_PROJECT_NOTIFY_RULE = `
mutation ( $input: ProjectNotificationRulePointer! ){
mutation toggleProjectNotificationsRuleEnabledState( $input: ProjectNotificationRulePointer! ){
toggleProjectNotificationsRuleEnabledState(
input: $input
) {
Expand Down
4 changes: 4 additions & 0 deletions src/api/workspaces/queries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ export const QUERY_ALL_WORKSPACES_WITH_PROJECTS = `
notifications {
...ProjectNotificationsRule
}
eventGroupingPatterns {
id
pattern
}
recentEvents(limit: 1) {
events {
id
Expand Down
1 change: 0 additions & 1 deletion src/components/modals/ChooseTariffPlanPopup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
</a>
</div>
</div>

</div>
</div>
</PopupDialog>
Expand Down
6 changes: 3 additions & 3 deletions src/components/modals/PaymentDetailsDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -681,10 +681,10 @@ export default Vue.extend({
<style>
.payment-details {
width: 558px;
min-height: 470px;
padding: 29px 21px 30px;
color: var(--color-text-main);
font-size: 14px;
min-height: 470px;

&__header {
margin: 0 159px 20px 0;
Expand Down Expand Up @@ -793,16 +793,16 @@ export default Vue.extend({
}

&__loading-text {
font-size: 16px;
margin-top: 20px;
font-size: 16px;
}

&__spinner {
width: 40px;
height: 40px;
border: 3px solid rgba(0, 0, 0, 0.1);
border-radius: 50%;
border-top-color: var(--color-indicator-medium);
border-radius: 50%;
animation: spinner 0.8s linear infinite;
}

Expand Down
Loading
Loading