From f3a57e06521f5bab0a2e2e170a12e3cde5b6a311 Mon Sep 17 00:00:00 2001 From: iso9000t <119494473+iso9000t@users.noreply.github.com> Date: Mon, 6 Jan 2025 01:56:40 +0400 Subject: [PATCH] fix: fix eight circular deps --- app/src/common/utils/validation/commonValidators.js | 3 +-- .../components/main/analytics/events/sidebarFooterEvents.js | 2 +- app/src/controllers/filter/sagas.js | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/common/utils/validation/commonValidators.js b/app/src/common/utils/validation/commonValidators.js index 15f2a12eb9..63c8275016 100644 --- a/app/src/common/utils/validation/commonValidators.js +++ b/app/src/common/utils/validation/commonValidators.js @@ -14,7 +14,6 @@ * limitations under the License. */ -import { commonValidators } from 'common/utils/validation/index'; import * as validate from './validate'; import { bindMessageToValidator, composeBoundValidators } from './validatorHelpers'; @@ -75,7 +74,7 @@ export const createRuleNameValidator = (notifications, notificationId) => ]); export const createProjectNameValidator = () => composeBoundValidators([ - commonValidators.requiredField, + requiredField, bindMessageToValidator(validate.projectNameLength, 'projectNameLengthHint'), bindMessageToValidator(validate.projectNamePattern, 'projectNamePatternHint'), ]); diff --git a/app/src/components/main/analytics/events/sidebarFooterEvents.js b/app/src/components/main/analytics/events/sidebarFooterEvents.js index fa7215d3af..ea089d9adc 100644 --- a/app/src/components/main/analytics/events/sidebarFooterEvents.js +++ b/app/src/components/main/analytics/events/sidebarFooterEvents.js @@ -14,7 +14,7 @@ * limitations under the License. */ -import { normalizeEventString } from 'components/main/analytics'; +import { normalizeEventString } from '../utils'; import { getBasicClickEventParameters, getBasicSearchEventParameters } from './common/ga4Utils'; const SIDEBAR = 'sidebar'; diff --git a/app/src/controllers/filter/sagas.js b/app/src/controllers/filter/sagas.js index b804535802..bd809a3993 100644 --- a/app/src/controllers/filter/sagas.js +++ b/app/src/controllers/filter/sagas.js @@ -25,12 +25,12 @@ import { import { showNotification, NOTIFICATION_TYPES } from 'controllers/notification'; import { userIdSelector } from 'controllers/user'; import { URLS } from 'common/urls'; -import { userFiltersSelector } from 'controllers/project/selectors'; +import { userFiltersSelector, projectKeySelector } from 'controllers/project/selectors'; import { updateProjectFilterPreferencesAction, fetchProjectPreferencesAction, } from 'controllers/project/actionCreators'; -import { projectKeySelector } from 'controllers/project'; + import { urlOrganizationAndProjectSelector, PROJECT_LAUNCHES_PAGE,