Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ae1a572
fix: clear customValidationError on unmount
Eliav-Maimon Aug 26, 2026
5af8b22
Merge branch 'master' of https://github.com/MapColonies/catalog-app i…
Eliav-Maimon Aug 30, 2026
952a9fe
fix: refactor error handling
Eliav-Maimon Sep 2, 2026
d87f99c
Merge branch 'master' of https://github.com/MapColonies/catalog-app i…
Eliav-Maimon Sep 2, 2026
5a79b50
fix: test and eslint
Eliav-Maimon Sep 2, 2026
177b2a0
fix: errors types
Eliav-Maimon Sep 2, 2026
c12412e
Merge branch 'master' into refactor-customValidationError-usage
Eliav-Maimon Sep 2, 2026
2d1f849
fix: same message format
Eliav-Maimon Sep 2, 2026
568cab5
fix: handle multiple serviceErrors
Eliav-Maimon Sep 3, 2026
747c66c
fix: error formating
Eliav-Maimon Sep 6, 2026
7d1409d
fix: align error text
Eliav-Maimon Sep 6, 2026
659689c
fix: delete state error and logic error components
Eliav-Maimon Sep 6, 2026
b114ad6
chore: remove comment
Eliav-Maimon Sep 6, 2026
ee0374d
fix: remove GraphQLError component
Eliav-Maimon Sep 7, 2026
dd807ac
fix: change error presentor css file location
Eliav-Maimon Sep 7, 2026
5f5cfb0
fix: import
Eliav-Maimon Sep 7, 2026
8b0c7db
chore: comment
Eliav-Maimon Sep 7, 2026
c0b2025
fix: functions parameters order
Eliav-Maimon Sep 7, 2026
080998b
fix: add missing dependencies
Eliav-Maimon Sep 7, 2026
a2a9c27
fix: take server-error file content to be in the same place in errorU…
Eliav-Maimon Sep 7, 2026
4c5ee9a
chore: buildError param name
Eliav-Maimon Sep 7, 2026
eef9b9d
fix: resolution conflict errors padding
Eliav-Maimon Sep 7, 2026
317f6ea
fix: memoize queryExecutor
Eliav-Maimon Sep 9, 2026
64f4e09
Merge branch 'master' of https://github.com/MapColonies/catalog-app i…
Eliav-Maimon Sep 10, 2026
2e0d402
fix: handle JS Error type
Eliav-Maimon Sep 10, 2026
92d1f39
fix: add ClientError type
Eliav-Maimon Sep 14, 2026
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
77 changes: 0 additions & 77 deletions src/common/components/error/graphql.error-presentor.tsx

This file was deleted.

34 changes: 0 additions & 34 deletions src/common/components/error/helpers.ts

This file was deleted.

48 changes: 0 additions & 48 deletions src/common/components/error/logic.error-presentor.tsx

This file was deleted.

45 changes: 0 additions & 45 deletions src/common/components/error/validations.error-presentor.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion src/common/components/grid/grid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ export const GridComponent: React.FC<GridComponentProps> = (props) => {
if (!row) {
handleFocusError?.({
code: 'warning.row-not-found',
message: '',
errText: '',
level: 'warning',
});
setIsRowFound?.(false);
Expand Down
56 changes: 0 additions & 56 deletions src/common/helpers/server-error.ts

This file was deleted.

5 changes: 1 addition & 4 deletions src/discrete-layer/components/catalog-tree/catalog-tree.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ import { Loading } from '../../../common/components/tree/statuses/loading';
import { getTextStyle, isUnpublished } from '../../../common/helpers/style';
import { isValidLayerMetadata } from '../../../common/helpers/layer-url';
import { LinkType } from '../../../common/models/link-type.enum';
import {
getResponseErrorMesssage,
getResponseErrorURL,
} from '../../../common/helpers/server-error';
import { getResponseErrorMesssage, getResponseErrorURL } from '../helpers/errorUtils';
import {
CRUDAction,
getActionsWithDisable,
Expand Down
7 changes: 4 additions & 3 deletions src/discrete-layer/components/dialogs/file-picker.dialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { observer } from 'mobx-react';
import { DialogContent } from '@material-ui/core';
import { Button, Dialog, DialogActions, DialogTitle, IconButton } from '@map-colonies/react-core';
import { Box, FileActionData, FileData, FilePickerActions } from '@map-colonies/react-components';
import { GraphQLError } from '../../../common/components/error/graphql.error-presentor';
import {
FilePickerComponent,
FilePickerComponentHandle,
Expand All @@ -22,6 +21,8 @@ import {
useStore,
} from '../../models';
import { isMultiSelection } from '../layer-details/utils';
import { formatError, IGraphqlError } from '../helpers/errorUtils';
import { ErrorPresentor } from '../error/error-presentor';

import './file-picker.dialog.css';

Expand Down Expand Up @@ -60,7 +61,7 @@ export const FilePickerDialog: React.FC<FilePickerDialogProps> = observer(
const [path, setPath] = useState<string>(
getSuffixFromFolderChain(currentSelection.folderChain)
);
const [graphQLError, setGraphQLError] = useState<Record<string, unknown> | null>(null);
const [graphQLError, setGraphQLError] = useState<IGraphqlError | null>(null);
const [selection, setSelection] = useState<Selection>(currentSelection);
const store = useStore();
const queryDirectory = useCallback(() => useQuery<{ getDirectory: FileModelType[] }>(), [])();
Expand Down Expand Up @@ -211,7 +212,7 @@ export const FilePickerDialog: React.FC<FilePickerDialogProps> = observer(
</DialogContent>
<DialogActions>
<Box className="messages">
<GraphQLError error={graphQLError ?? {}} />
<ErrorPresentor errors={formatError(intl, graphQLError, 'error')} />
</Box>
<Box className="buttons">
<Button
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.errorContainer {
flex-grow: 1;
display: flex;
color: var(--mdc-theme-gc-error-high);
align-items: flex-start;
Expand All @@ -13,6 +12,7 @@
.errorsList {
list-style: circle;
margin: 0;
padding-left: 32px;
height: 60px;
min-width: 264px;
overflow-y: auto;
Expand All @@ -25,3 +25,7 @@ body[dir='rtl'] .errorsList {
body[dir='rtl'] .errorContainer {
flex-direction: row-reverse;
}

.errorsList li {
text-align: start;
}
Loading
Loading