Skip to content

EPMRPP-98444 || Fix circular dependencies #4184

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

Draft
wants to merge 2 commits into
base: feature/orgs
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 2 deletions app/src/common/utils/validation/commonValidators.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -63,19 +62,19 @@

export const emailCreateUserValidator = () =>
composeBoundValidators([
commonValidators.requiredField,

Check failure on line 65 in app/src/common/utils/validation/commonValidators.js

View workflow job for this annotation

GitHub Actions / build (20)

'commonValidators' is not defined
bindMessageToValidator(validate.requiredEmail, 'emailCreateUserHint'),
]);

export const createPatternCreateUserNameValidator = () =>
composeBoundValidators([
commonValidators.requiredField,

Check failure on line 71 in app/src/common/utils/validation/commonValidators.js

View workflow job for this annotation

GitHub Actions / build (20)

'commonValidators' is not defined
bindMessageToValidator(validate.userCreateName, 'nameCreateUserHint'),
]);

export const createPatternCreateUserPasswordValidator = () =>
composeBoundValidators([
commonValidators.requiredField,

Check failure on line 77 in app/src/common/utils/validation/commonValidators.js

View workflow job for this annotation

GitHub Actions / build (20)

'commonValidators' is not defined
bindMessageToValidator(validate.passwordCreateUser, 'passwordCreateUserHint'),
]);

Expand All @@ -94,7 +93,7 @@
]);
export const createProjectNameValidator = () =>
composeBoundValidators([
commonValidators.requiredField,
requiredField,
bindMessageToValidator(validate.projectNameLength, 'projectNameLengthHint'),
bindMessageToValidator(validate.projectNamePattern, 'projectNamePatternHint'),
]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions app/src/controllers/filter/sagas.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion app/src/controllers/plugins/sagas.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { hideModalAction } from 'controllers/modal';
import { showScreenLockAction, hideScreenLockAction } from 'controllers/screenLock';
import { fetch, omit } from 'common/utils';
import { userIdSelector } from 'controllers/user';
import { projectKeySelector } from 'controllers/project';
import { projectKeySelector } from 'controllers/project/selectors';
import {
NAMESPACE,
FETCH_PLUGINS,
Expand Down
2 changes: 1 addition & 1 deletion app/src/controllers/project/sagas.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
import { hideModalAction } from 'controllers/modal';
import { showScreenLockAction, hideScreenLockAction } from 'controllers/screenLock';
import { fetch } from 'common/utils';
import { setProjectIntegrationsAction } from 'controllers/plugins';
import { setProjectIntegrationsAction } from 'controllers/plugins/actionCreators';
import {
addFilterAction,
fetchUserFiltersSuccessAction,
Expand Down
Loading