-
Notifications
You must be signed in to change notification settings - Fork 0
feat: add layer deletion schemas, types and constants (MAPCO-7285) #210
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
Open
almog8k
wants to merge
4
commits into
alpha
Choose a base branch
from
feat/delete-layer-MAPCO-7285
base: alpha
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| /* eslint-disable @typescript-eslint/naming-convention */ | ||
| export const DeletionJobTypes = { | ||
| Delete_Layer: 'Delete_Layer', | ||
| } as const; | ||
|
|
||
| export type DeletionJobTypes = (typeof DeletionJobTypes)[keyof typeof DeletionJobTypes]; | ||
|
|
||
| export const DeletionTaskTypes = { | ||
| Delete: 'delete', | ||
| LayerTilesDeletion: 'full-layer-tiles-deletion', | ||
| ArtifactsDeletion: 'artifacts-deletion', | ||
| } as const; | ||
|
|
||
| export type DeletionTaskTypes = (typeof DeletionTaskTypes)[keyof typeof DeletionTaskTypes]; | ||
| /* eslint-enable @typescript-eslint/naming-convention */ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export * from './constants'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| export * from './core'; | ||
| export * from './ingestion'; | ||
| export * from './export'; | ||
| export * from './deletion'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| export * from './task.schema'; | ||
| export * from './job.schema'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| import { z } from 'zod'; | ||
|
|
||
| export const deleteLayerJobParamsSchema = z | ||
| .object({ | ||
| approver: z.string(), | ||
| }) | ||
| .describe('deleteLayerJobParamsSchema'); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| import { z } from 'zod'; | ||
| import { SourceType } from '../../constants/core/constants'; | ||
|
|
||
| export const sourceProviderSchema = z.union([z.literal(SourceType.S3), z.literal(SourceType.FS)]); | ||
|
|
||
| export const deleteTaskParamsSchema = z | ||
| .object({ | ||
| deleteFromCatalog: z.boolean().default(false), | ||
| deleteFromMapproxy: z.boolean().default(false), | ||
| deleteFromGeoserver: z.boolean().default(false), | ||
| deletePolygonParts: z.boolean().default(false), | ||
| }) | ||
| .describe('deleteTaskParamsSchema'); | ||
|
|
||
| export const layerTilesDeletionParamsSchema = z | ||
| .object({ | ||
| catalogId: z.string().uuid(), | ||
| sourceProvider: sourceProviderSchema, | ||
| }) | ||
| .describe('layerTilesDeletionParamsSchema'); | ||
|
|
||
| export const artifactsDeletionParamsSchema = z | ||
| .object({ | ||
| sourceProvider: sourceProviderSchema, | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. add optional "bucket" param
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added |
||
| paths: z.array(z.string().min(1)).min(1), // explicit thumbnail/legend object keys (s3) or file paths (fs) | ||
| }) | ||
| .describe('artifactsDeletionParamsSchema'); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| export * from './core'; | ||
| export * from './ingestion'; | ||
| export * from './export'; | ||
| export * from './deletion'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| export * from './task.type'; | ||
| export * from './job.type'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| import z from 'zod'; | ||
| import { deleteLayerJobParamsSchema } from '../../schemas/deletion/job.schema'; | ||
|
|
||
| export type DeleteLayerJobParams = z.infer<typeof deleteLayerJobParamsSchema>; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| import z from 'zod'; | ||
| import { deleteTaskParamsSchema, layerTilesDeletionParamsSchema, artifactsDeletionParamsSchema } from '../../schemas/deletion/task.schema'; | ||
|
|
||
| export type DeleteTaskParams = z.infer<typeof deleteTaskParamsSchema>; | ||
| export type LayerTilesDeletionParams = z.infer<typeof layerTilesDeletionParamsSchema>; | ||
| export type ArtifactsDeletionParams = z.infer<typeof artifactsDeletionParamsSchema>; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| export * from './core'; | ||
| export * from './ingestion'; | ||
| export * from './export'; | ||
| export * from './deletion'; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
keep as 'tiles-deletion' as the job type itself is "Delete-Layer"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed to tiles-deletion
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed