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

feat: apply alert manager v2 #5466

Merged
merged 149 commits into from
Jan 9, 2025
Merged

feat: apply alert manager v2 #5466

merged 149 commits into from
Jan 9, 2025

Conversation

skdud4659
Copy link
Member

To Reviewers

  • Self-reviewed (coding conventions, bug-free, functionality verified, tests checked, documentation updated)
  • Minor change, review optional (style, chore, ci, straightforward changes, etc.)
  • Previously reviewed in feature branch, no further review needed
  • Need review or discussion

Description (optional)

SSIA

Things to Talk About (optional)

skdud4659 and others added 30 commits November 28, 2024 16:58
* chore: update translations

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: create alert manager v2 menu

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: update translations

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: apply heading layout

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
* chore: update translations

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: create alert manager container

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: mark-up service main page

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: add type

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
#5116)

* refactor: change the 'p-card' component to 'p-select-card'

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: apply click event at service item card

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
* feat: routing to the service detail page

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: update translations

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: create header at service detail page

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
* feat: service create page routing

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: create common header section for service creation page

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: markup for the first step of the service creation page

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: update translations

Signed-off-by: NaYeong,Kim <[email protected]>

* refactor: modify form update logic

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
…tion page (#5124)

* refactor: apply componentization for common parts in the service creation page

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: reset state when unMounted creation page

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: add type

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
* feat: markup for step 2-1 of the service creation page

Signed-off-by: NaYeong,Kim <[email protected]>

* refactor: componentization of step2 in the service creation page

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: markup for step 2-2 of the service creation page

Signed-off-by: NaYeong,Kim <[email protected]>

* fix: fixed minor bug (reset state, style)

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: markup for step 2-3 of the service creation page

Signed-off-by: NaYeong,Kim <[email protected]>

* refactor: modify the container to manage only buttons based on the step

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: update translations and style

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: apply pr review (add return type, separating store state)

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
Signed-off-by: NaYeong,Kim <[email protected]>
* feat: create tabs at service detail page

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: markup for the status section in the overview tab of the service detail page

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: markup for the webhook section in the overview tab of the service detail page

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: markup for the extra section in the overview tab of the service detail page

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: update translations

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
* feat: markup for step 3 of the service creation page

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: markup for step 3-1 of the service creation page

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
* chore: changed store name

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: markup for the webhook tab of the service detail page

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: update translations

Signed-off-by: NaYeong,Kim <[email protected]>

* fix: fixed conflict error

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
* refactor(router): rename routes for resource manager v1

- Renamed admin, integral, and workspace routes to reflect resource manager v1.
- Updated route imports and exports to match new naming convention.

Signed-off-by: sulmo <[email protected]>

* feat(router): update admin and workspace routes for resource manager v2

- Introduced `adminRoutes` for managing admin-specific paths.
- Added `integralRoutes` to handle main application routing logic.
- Implemented `workspaceRoutes` for workspace-related navigation.
- Updated router initialization to support resource manager versioning.

Signed-off-by: sulmo <[email protected]>

---------

Signed-off-by: sulmo <[email protected]>
* feat: markup for the settings tab of the service detail page

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: update translations

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: key binding

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
… is clicked (#5141)

* feat: reflecting tabs in the query string

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: apply tab switching when the details button in the overview tab is clicked

Signed-off-by: NaYeong,Kim <[email protected]>

* refactor: use 'getProperRouteLocation'

Signed-off-by: NaYeong,Kim <[email protected]>

* fix: fixed router guard error

Signed-off-by: NaYeong,Kim <[email protected]>

* fix: fixed action name

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
feat: separate assetInventory router



refactor(routes): update asset inventory routes to version 2

Signed-off-by: sulmo <[email protected]>
…5143)

* feat: create webhook / notifications creation page and apply routing

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: add type

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
* feat: create alerts menu and detail/main page

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: changed alerts manu id

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: changed menuId, route-constants

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
…#5152)

* refactor: renaming for common component usage

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: apply webhook create step at webhook creation page

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: apply notifications create step at notifications creation page

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: add type, change css

Signed-off-by: NaYeong,Kim <[email protected]>

* fix: fixed store reset error

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: fixed lint error

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
Signed-off-by: NaYeong,Kim <[email protected]>
#5153)

* feat: markup alerts main page

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: copy the alert section of the existing project details page

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
Signed-off-by: NaYeong,Kim <[email protected]>
* refactor: refactor code for alert detail summary

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: add type

Signed-off-by: NaYeong,Kim <[email protected]>

* refactor: refactor code for alert detail info table

Signed-off-by: NaYeong,Kim <[email protected]>

* refactor: refactor code for alert detail tabs

Signed-off-by: NaYeong,Kim <[email protected]>

* refactor: refactor code for alert detail Note

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: minor changed (type, props, translations)

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
JEONG-SEULAH and others added 26 commits January 2, 2025 23:30
Signed-off-by: Seulah <[email protected]>
Signed-off-by: NaYeong,Kim <[email protected]>
Co-authored-by: NaYeong,Kim <[email protected]>
* feat: apply history data at timeline

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: apply quick filter at timeline

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: apply alert manager webhook at reference store

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: update translations

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: apply code modal and search

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
* chore: changed service key validation

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: changed design

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: update translations

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
* fix: update created_at name due to error message

Signed-off-by: 이승연 <[email protected]>

* fix: update user data table not showing userGroup in admin mode

Signed-off-by: 이승연 <[email protected]>

* feat: update validation of creating userGroupChannel

Signed-off-by: 이승연 <[email protected]>

* feat: update qa (ing)

Signed-off-by: seungyeoneeee <[email protected]>

* fix: update minor change about button style

Signed-off-by: 이승연 <[email protected]>

* feat: update user&userGroup delete check modal with table

Signed-off-by: 이승연 <[email protected]>

* feat: update userGroupSelectDropdown using

Signed-off-by: 이승연 <[email protected]>

* feat: update language

Signed-off-by: 이승연 <[email protected]>

* feat: update user table per userGroup (loading, reactive)

Signed-off-by: 이승연 <[email protected]>

* feat: add icon of selectedProtocol

Signed-off-by: 이승연 <[email protected]>

* feat: update userGroupChannel tab about querySearch

Signed-off-by: 이승연 <[email protected]>

* feat: update channelSetModal

Signed-off-by: 이승연 <[email protected]>

* feat: add type

Signed-off-by: 이승연 <[email protected]>

---------

Signed-off-by: 이승연 <[email protected]>
Signed-off-by: seungyeoneeee <[email protected]>
* feat: apply opsFlow route at v1

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: apply user select dropdown at opsFlow

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
* feat: update reactivity of userGroupChannel Tab

Signed-off-by: 이승연 <[email protected]>

* fix: fix description field width to 480px

Signed-off-by: 이승연 <[email protected]>

* feat: update user tab about distinct helper and valueHandlerMap

Signed-off-by: 이승연 <[email protected]>

* fix: update minor changes

Signed-off-by: 이승연 <[email protected]>

* feat: update reactivity in userGroupChannel tab

Signed-off-by: 이승연 <[email protected]>

* fix: remove schedule distinct (temporary)

Signed-off-by: 이승연 <[email protected]>

* fix: fix reload method

Signed-off-by: 이승연 <[email protected]>

* feat: update validation of channelName

Signed-off-by: 이승연 <[email protected]>

* feat: update user group tabs refreshable

Signed-off-by: 이승연 <[email protected]>

* fix: update to reset when unMounted

Signed-off-by: 이승연 <[email protected]>

* fix: remove bgColor along to design

Signed-off-by: 이승연 <[email protected]>

---------

Signed-off-by: 이승연 <[email protected]>
* fix: fixed draggable bug

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: changed alert main page design

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: apply changed design at alert detail page

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: add icon

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: apply changed service main design

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: update translations

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
* chore: update translations

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: changed end time (schedule-setting-form)

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: update translations

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
* feat: apply changed design at service alert tab

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: update translations

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
* fix: remove unnecessary description

Signed-off-by: 이승연 <[email protected]>

* feat: update remove user table check modal with service

Signed-off-by: 이승연 <[email protected]>

* feat: update remove user & userGroup table check modal with service

Signed-off-by: 이승연 <[email protected]>

* fix: update service reference store for `members`

Signed-off-by: 이승연 <[email protected]>

* feat: update delete button to be possible to delete multiple userGroups

Signed-off-by: 이승연 <[email protected]>

---------

Signed-off-by: 이승연 <[email protected]>
* feat: apply qa issue

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: update translations

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
* feat: update rendering method to better way

Signed-off-by: 이승연 <[email protected]>

* feat: update method `reduce` of lodash

Signed-off-by: seungyeoneeee <[email protected]>

* feat: update sorting and querySearch at user data table of user group tab

Signed-off-by: 이승연 <[email protected]>

* fix: fix different size of success message font

Signed-off-by: 이승연 <[email protected]>

* fix: update action after add&remove user in userGroup

Signed-off-by: 이승연 <[email protected]>

* feat: update modal overflow-auto

Signed-off-by: 이승연 <[email protected]>

* feat: update creating userGroupChannel store

it has to be divided to two ways of creating and updating

Signed-off-by: 이승연 <[email protected]>

* feat: update setting fields `notification channel` `user` as unsortable

Signed-off-by: 이승연 <[email protected]>

---------

Signed-off-by: 이승연 <[email protected]>
Signed-off-by: seungyeoneeee <[email protected]>
* fix: remove wrong css code (it triggered unnecessary scroll)

Signed-off-by: 이승연 <[email protected]>

* feat: update user remove check-table Modal with userGroup field

Signed-off-by: 이승연 <[email protected]>

* feat: update `ScheduleSettingForm` for showing already created time data

Signed-off-by: 이승연 <[email protected]>

---------

Signed-off-by: 이승연 <[email protected]>
* fix: update double check modal tableItems logic

Signed-off-by: 이승연 <[email protected]>

* feat: update api-connection with alertManagerV2

Signed-off-by: 이승연 <[email protected]>

---------

Signed-off-by: 이승연 <[email protected]>
* feat: create event-rule page

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: route to event rule page

Signed-off-by: NaYeong,Kim <[email protected]>

* refactor: modified to an internal component element on the event-rule page

Signed-off-by: NaYeong,Kim <[email protected]>

* feat(event-rule): create scope modal

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: apply event-rule page

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: update translations

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: markup event-rule (card info section)

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: create event rule card

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: create delete event rule

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: apply event rule form card (condition, base info)

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: create event rule form card

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: apply action form at event rule

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: apply validation at event rule form

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: apply event-rule card

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: apply additional info at card

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: apply edit mode

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: apply event rule update

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: apply search

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: update translations

Signed-off-by: NaYeong,Kim <[email protected]>

* feat: apply event rule count

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
* chore: update translations

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: update translations

Signed-off-by: NaYeong,Kim <[email protected]>

* chore: update translations

Signed-off-by: NaYeong,Kim <[email protected]>

---------

Signed-off-by: NaYeong,Kim <[email protected]>
* chore: Add translation

Signed-off-by: Seulah <[email protected]>

* chore: Add translation

Signed-off-by: Seulah <[email protected]>

---------

Signed-off-by: Seulah <[email protected]>
Copy link

vercel bot commented Jan 9, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
inventory-v2 ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jan 9, 2025 4:10am
2 Skipped Deployments
Name Status Preview Comments Updated (UTC)
console ⬜️ Ignored (Inspect) Jan 9, 2025 4:10am
dashboard ⬜️ Ignored (Inspect) Jan 9, 2025 4:10am

.replace(/'/g, '')
.replace(/(\\r\\n|\\n|\\r)/gm, '\n')
.replace(/(\\t)/gm, '');
if (result.startsWith('\n')) result = result.replace('\n', '');

Check failure

Code scanning / CodeQL

Incomplete string escaping or encoding High

This replaces only the first occurrence of '\n'.

Copilot Autofix AI 16 days ago

To fix the problem, we need to ensure that all leading newline characters are removed from the result string. This can be achieved by using a regular expression with the global flag (g) to replace all occurrences of the newline character at the start of the string.

  • Modify the result.replace call on line 87 to use a regular expression that matches all leading newline characters.
  • Ensure that the regular expression is correctly applied to handle multiple leading newline characters.
Suggested changeset 1
apps/web/src/services/asset-inventory-v1/components/CollectorHistoryJobTaskErrorList.vue

Autofix patch

Autofix patch
Run the following command in your local git repository to apply this patch
cat << 'EOF' | git apply
diff --git a/apps/web/src/services/asset-inventory-v1/components/CollectorHistoryJobTaskErrorList.vue b/apps/web/src/services/asset-inventory-v1/components/CollectorHistoryJobTaskErrorList.vue
--- a/apps/web/src/services/asset-inventory-v1/components/CollectorHistoryJobTaskErrorList.vue
+++ b/apps/web/src/services/asset-inventory-v1/components/CollectorHistoryJobTaskErrorList.vue
@@ -86,3 +86,3 @@
         .replace(/(\\t)/gm, '');
-    if (result.startsWith('\n')) result = result.replace('\n', '');
+    if (result.startsWith('\n')) result = result.replace(/^\n+/g, '');
     return result;
EOF
@@ -86,3 +86,3 @@
.replace(/(\\t)/gm, '');
if (result.startsWith('\n')) result = result.replace('\n', '');
if (result.startsWith('\n')) result = result.replace(/^\n+/g, '');
return result;
Copilot is powered by AI and may make mistakes. Always verify output.
Positive Feedback
Negative Feedback

Provide additional feedback

Please help us improve GitHub Copilot by sharing more details about this comment.

Please select one or more of the options
@skdud4659 skdud4659 merged commit 6df4b59 into master Jan 9, 2025
7 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants