jmapcloud-ng-core-types 2.0.14-qa.5 → 2.0.14-qa.6

package/all-enums.ts

@@ -1,18 +1,10 @@
 import {
-  FORMSCHEMA_TYPES,
   JFATAL_ERROR_CONTEXTS,
-  JFORM_FIELD_TYPES,
-  JFORM_OPERATION_TYPES,
-  JFORM_TYPES,
-  JFORM_UI_CONTROL_ALIGNMENTS,
-  JFORM_WIDGET_TYPES,
   JGEOMETRY_UNITS,
-  JJSON_SCHEMA_TYPES,
   JLAYER_ATTRIBUTE_TYPES,
   JLAYER_DYNAMIC_FILTER_OPERATORS,
   JLAYER_ELEMENT_TYPES,
   JLAYER_GEOMETRIES,
-  JLAYER_INFORMATION_REPORT_TYPES,
   JLAYER_LAYER_REQUEST_MODES,
   JLAYER_LAYER_TYPES,
   JLAYER_METADATA_TYPES,
@@ -35,7 +27,6 @@ import {
   JMAP_RASTER_SCHEME_TYPES,
   JOPERATING_SYSTEMS,
   JORGANIZATION_EXTERNAL_API_KEY_TYPES,
-  JPHOTO_PROJECTION_TYPES,
   JSERVER_IDENTITY_PROVIDER_TYPES,
   JSERVER_MICRO_SERVICE_STATUSES,
   JTABLE_ATTRIBUTE_TYPES,
@@ -45,52 +36,6 @@ import {
   ROLES
 } from "./enums"
 
-export const ALL_PHOTO_PROJECTION_TYPES: JPHOTO_PROJECTION_TYPES[] = [JPHOTO_PROJECTION_TYPES.NONE, JPHOTO_PROJECTION_TYPES.EQUIRECTANGULAR]
-
-export const ALL_FORM_TYPES: JFORM_TYPES[] = [JFORM_TYPES.DEPRECATED, JFORM_TYPES.ATTRIBUTE, JFORM_TYPES.ATTRIBUTE_SUB_FORM, JFORM_TYPES.EXTERNAL, JFORM_TYPES.EXTERNAL_SUB_FORM]
-
-export const ALL_FORM_UI_CONTROL_ALIGNMENTS: JFORM_UI_CONTROL_ALIGNMENTS[] = [JFORM_UI_CONTROL_ALIGNMENTS.LEFT, JFORM_UI_CONTROL_ALIGNMENTS.CENTER, JFORM_UI_CONTROL_ALIGNMENTS.RIGHT]
-
-export const ALL_FORM_WIDGET_TYPES: JFORM_WIDGET_TYPES[] = [
-  JFORM_WIDGET_TYPES.INPUT,
-  JFORM_WIDGET_TYPES.RANGE,
-  JFORM_WIDGET_TYPES.SWITCH,
-  JFORM_WIDGET_TYPES.SELECT,
-  JFORM_WIDGET_TYPES.DATE,
-  JFORM_WIDGET_TYPES.PHOTO,
-  JFORM_WIDGET_TYPES.TREE,
-  JFORM_WIDGET_TYPES.LABEL,
-  JFORM_WIDGET_TYPES.SPAN,
-  JFORM_WIDGET_TYPES.TABLE
-]
-
-export const ALL_JSON_SCHEMA_TYPES: JJSON_SCHEMA_TYPES[] = [
-  JJSON_SCHEMA_TYPES.STRING,
-  JJSON_SCHEMA_TYPES.NUMBER,
-  JJSON_SCHEMA_TYPES.INTEGER,
-  JJSON_SCHEMA_TYPES.BOOLEAN,
-  JJSON_SCHEMA_TYPES.ARRAY,
-  JJSON_SCHEMA_TYPES.OBJECT
-]
-
-export const ALL_FORM_OPERATION_TYPES: JFORM_OPERATION_TYPES[] = [JFORM_OPERATION_TYPES.CREATION, JFORM_OPERATION_TYPES.UPDATE, JFORM_OPERATION_TYPES.DELETE]
-
-export const ALL_FORM_FIELD_TYPES: JFORM_FIELD_TYPES[] = [
-  JFORM_FIELD_TYPES.EMPTY,
-  JFORM_FIELD_TYPES.COLUMN_SPAN,
-  JFORM_FIELD_TYPES.LABEL,
-  JFORM_FIELD_TYPES.TEXT,
-  JFORM_FIELD_TYPES.RANGE,
-  JFORM_FIELD_TYPES.SELECT_ONE,
-  JFORM_FIELD_TYPES.SELECT_MANY,
-  JFORM_FIELD_TYPES.DATE,
-  JFORM_FIELD_TYPES.BOOLEAN,
-  JFORM_FIELD_TYPES.GROUP_PANEL,
-  JFORM_FIELD_TYPES.DOCUMENT,
-  JFORM_FIELD_TYPES.TREE,
-  JFORM_FIELD_TYPES.TABLE
-]
-
 export const ALL_TIME_UNITS: JTIME_UNITS[] = [JTIME_UNITS.SECONDS, JTIME_UNITS.MINUTES, JTIME_UNITS.HOURS, JTIME_UNITS.DAYS, JTIME_UNITS.WEEKS, JTIME_UNITS.MONTHS, JTIME_UNITS.YEARS]
 
 export const ALL_GEOMETRY_UNITS: JGEOMETRY_UNITS[] = [JGEOMETRY_UNITS.KILOMETERS, JGEOMETRY_UNITS.MILES, JGEOMETRY_UNITS.DEGREES, JGEOMETRY_UNITS.RADIANS]
@@ -145,15 +90,6 @@ export const ALL_LAYER_STYLE_TYPES: JLAYER_STYLE_TYPES[] = [JLAYER_STYLE_TYPES.P
 
 export const ALL_LAYER_STYLE_ARROW_TYPES: JLAYER_STYLE_ARROW_TYPES[] = [JLAYER_STYLE_ARROW_TYPES.NONE, JLAYER_STYLE_ARROW_TYPES.FORWARD, JLAYER_STYLE_ARROW_TYPES.BACKWARD]
 
-export const ALL_LAYER_INFORMATION_REPORT_TYPES: JLAYER_INFORMATION_REPORT_TYPES[] = [
-  JLAYER_INFORMATION_REPORT_TYPES.JSP,
-  JLAYER_INFORMATION_REPORT_TYPES.BIRT,
-  JLAYER_INFORMATION_REPORT_TYPES.BIRT_HTML,
-  JLAYER_INFORMATION_REPORT_TYPES.BIRT_PDF,
-  JLAYER_INFORMATION_REPORT_TYPES.WMS,
-  JLAYER_INFORMATION_REPORT_TYPES.CUSTOM
-]
-
 export const ALL_LAYER_STYLE_RULE_CONDITION_EXPRESSION_OPERATORS: JLAYER_STYLE_RULE_CONDITION_EXPRESSION_OPERATORS[] = [
   JLAYER_STYLE_RULE_CONDITION_EXPRESSION_OPERATORS.EMPTY,
   JLAYER_STYLE_RULE_CONDITION_EXPRESSION_OPERATORS.NOT_EMPTY,
@@ -207,7 +143,7 @@ export const ALL_OPERATING_SYSTEMS: JOPERATING_SYSTEMS[] = [
   JOPERATING_SYSTEMS.LINUX
 ]
 
-export const ALL_FATAL_ERROR_CONTEXTS: JFATAL_ERROR_CONTEXTS[] = [JFATAL_ERROR_CONTEXTS.FORM, JFATAL_ERROR_CONTEXTS.LAYER, JFATAL_ERROR_CONTEXTS.MAP, JFATAL_ERROR_CONTEXTS.PROJECT]
+export const ALL_FATAL_ERROR_CONTEXTS: JFATAL_ERROR_CONTEXTS[] = [JFATAL_ERROR_CONTEXTS.LAYER, JFATAL_ERROR_CONTEXTS.MAP, JFATAL_ERROR_CONTEXTS.PROJECT]
 
 export const ALL_MAP_CONTEXT_APPLY_TYPES: JMAP_CONTEXT_APPLY_TYPES[] = [JMAP_CONTEXT_APPLY_TYPES.STANDARD, JMAP_CONTEXT_APPLY_TYPES.DEFAULT, JMAP_CONTEXT_APPLY_TYPES.SHARED]
 

package/enums.ts

@@ -32,65 +32,6 @@ export enum JMAP_RASTER_SCHEME_TYPES {
   XYZ = "xyz"
 }
 
-// From form.d.ts
-export enum JFORM_TYPES {
-  DEPRECATED = "DEPRECATED_FORM",
-  ATTRIBUTE = "LAYER_ATTRIBUTES_FORM",
-  ATTRIBUTE_SUB_FORM = "LAYER_ATTRIBUTES_SUB_FORM",
-  EXTERNAL = "EXTERNAL_ATTRIBUTES_FORM",
-  EXTERNAL_SUB_FORM = "EXTERNAL_ATTRIBUTES_SUB_FORM"
-}
-
-export enum JFORM_UI_CONTROL_ALIGNMENTS {
-  LEFT = "LEFT",
-  CENTER = "CENTER",
-  RIGHT = "RIGHT"
-}
-
-export enum JFORM_WIDGET_TYPES {
-  INPUT = "input",
-  RANGE = "range",
-  SWITCH = "switch",
-  SELECT = "select",
-  DATE = "date",
-  PHOTO = "photo",
-  TREE = "tree",
-  LABEL = "label",
-  SPAN = "span",
-  TABLE = "table"
-}
-
-export enum JJSON_SCHEMA_TYPES {
-  STRING = "string",
-  NUMBER = "number",
-  INTEGER = "integer",
-  BOOLEAN = "boolean",
-  ARRAY = "array",
-  OBJECT = "object"
-}
-
-export enum JFORM_OPERATION_TYPES {
-  CREATION = "creation",
-  UPDATE = "update",
-  DELETE = "delete"
-}
-
-export enum JFORM_FIELD_TYPES {
-  EMPTY = "TYPE_EMPTY",
-  COLUMN_SPAN = "TYPE_COLUMN_SPAN",
-  LABEL = "TYPE_LABEL",
-  TEXT = "TYPE_INPUT_TEXT",
-  RANGE = "TYPE_INPUT_RANGE",
-  SELECT_ONE = "TYPE_SELECT_ONE",
-  SELECT_MANY = "TYPE_SELECT_MANY",
-  DATE = "TYPE_INPUT_DATE",
-  BOOLEAN = "TYPE_SELECT_BOOLEAN",
-  GROUP_PANEL = "TYPE_GROUP_PANEL",
-  DOCUMENT = "TYPE_DOCUMENT",
-  TREE = "TYPE_TREE",
-  TABLE = "TYPE_TABLE"
-}
-
 // From table.d.ts
 export enum JTABLE_ATTRIBUTE_TYPES {
   STRING = "string",
@@ -123,12 +64,6 @@ export enum JORGANIZATION_EXTERNAL_API_KEY_TYPES {
   MAPBOX_ACCESS_TOKEN = "MAPBOX_ACCESS_TOKEN"
 }
 
-// From photos.d.ts
-export enum JPHOTO_PROJECTION_TYPES {
-  NONE = "none",
-  EQUIRECTANGULAR = "equirectangular"
-}
-
 // From geometry.d.ts
 export enum JGEOMETRY_UNITS {
   KILOMETERS = "kilometers",
@@ -166,7 +101,6 @@ export enum JOPERATING_SYSTEMS {
 }
 
 export enum JFATAL_ERROR_CONTEXTS {
-  FORM = "FORM",
   LAYER = "LAYER",
   MAP = "MAP",
   PROJECT = "PROJECT"
@@ -245,15 +179,6 @@ export enum JLAYER_STYLE_ARROW_TYPES {
   BACKWARD = "BACKWARD"
 }
 
-export enum JLAYER_INFORMATION_REPORT_TYPES {
-  JSP = "JSP",
-  BIRT = "BIRT",
-  BIRT_HTML = "BIRT_HTML",
-  BIRT_PDF = "BIRT_PDF",
-  WMS = "WMS",
-  CUSTOM = "CUSTOM"
-}
-
 export enum JLAYER_STYLE_RULE_CONDITION_EXPRESSION_OPERATORS {
   EMPTY = "EMPTY",
   NOT_EMPTY = "NOT_EMPTY",
@@ -328,15 +253,6 @@ export enum ATTRIBUTE_TYPES {
   BOOLEAN = "BOOLEAN"
 }
 
-// From formJMC.d.ts
-export enum FORMSCHEMA_TYPES {
-  STRING = "string",
-  INTEGER = "integer",
-  NUMBER = "number",
-  BOOLEAN = "boolean",
-  ARRAY = "array"
-}
-
 // From project.d.ts
 export enum JTERRAIN_ILLUMINATION_ANCHOR_TYPES {
   VIEWPORT = "VIEWPORT",

package/index.d.ts

@@ -1,6 +1,6 @@
 /// <reference path="./public/global-aliases.d.ts" />
 import { Feature, FeatureCollection, LineString, MultiLineString, Point, Polygon } from "geojson"
-import { JAttribute, JDataSource, JDataSourceType, JForm as JFormJMC, JRelationship } from "jmapcloud-types"
+import { JAttribute, JDataSource, JDataSourceType, JForm, JRelationship } from "jmapcloud-types"
 import type * as maplibregl from "maplibre-gl"
 import { Action, Store } from "redux"
 import { JDataSourceData, JDataSourceDataParams, JDataSourcePermissions } from "./public/jmap/datasource.ts"
@@ -9,7 +9,6 @@ import type { JCoreState, JMapLegendMode } from "./public/state.d.ts"
 export type { JCoreOptions } from "./public/jmap/startup-options.d.ts"
 export type {
   JCoreState,
-  JFormState,
   JGeocodingState,
   JGeolocationState,
   JLegendState,
@@ -42,7 +41,6 @@ export interface JCoreService extends JCoreMainService {
   MouseOver: JMouseOverService
   Attachment: JAttachmentService
   Form: JFormService
-  FormJMC: JFormJMCService
   Event: JEventService
   History: JHistoryService
   Extension: JExtensionService
@@ -229,7 +227,6 @@ export interface JEventService {
   Project: JProjectEventModule
   User: JUserEventModule
   Feature: JFeatureEventModule
-  Form: JFormEventModule
   Extension: JExtensionEventModule
   MouseOver: JMouseOverEventModule
   MapContext: JMapContextEventModule
@@ -265,17 +262,6 @@ export interface JServerEventModule extends JEventModule {
   }
 }
 
-export interface JFormEventModule extends JEventModule {
-  on: {
-    layerDialogOpened(listenerId: string, fn: (params: JFormLayerDialogOpenEventParams) => void): void
-    layerDialogClosed(listenerId: string, fn: (params: JFormLayerDialogCloseEventParams) => void): void
-    subFormDialogOpened(listenerId: string, fn: (params: JFormSubFormDialogOpenEventParams) => void): void
-    subFormDialogClosed(listenerId: string, fn: (params: JFormSubFormDialogCloseEventParams) => void): void
-    beforeSubmit(listenerId: string, fn: (params: JFormBeforeSubmitEventParams) => void | Promise<any>): void
-    submit(listenerId: string, fn: (params: JFormSubmitEventParams) => void): void
-  }
-}
-
 export interface JMouseOverEventModule extends JEventModule {
   on: {
     beforeContentProcessed(listenerId: string, fn: (params: JMouseOverBeforeEventParams) => void): void
@@ -405,8 +391,8 @@ export interface JMapContextEventModule extends JEventModule {
 
 export type JHistoryListener = (oldValue: string | undefined, newValue: string | undefined) => void
 
-export interface JFormJMCService {
-  getForm(dataSourceId: string): Promise<JFormJMC | null>
+export interface JFormService {
+  getForm(dataSourceId: string): Promise<JForm | null>
 }
 
 export interface JAttachmentService {
@@ -419,58 +405,6 @@ export interface JAttachmentService {
   previewAttachments(attachmentId: string, dataSourceId: string, dataSourceOrganizationId: string, itemId: JId): void
 }
 
-export interface JFormService {
-  // REPO METHODS
-  getFormsMetaDataByLayerId(layerId: JId): Promise<JFormMetaData[]>
-  getElement(params: JFormElementId): Promise<JFormElement | undefined>
-  getElements(params: JFormElementIds): Promise<JFormElement[]>
-  getEntries(params: JFormGetEntriesParams): Promise<JFormElement[]>
-  createAttributeFormElement(params: JFormCreateAttributeFormElementParams): Promise<GeoJSON.Feature>
-  createDatabaseFormEntry(params: JFormCreateElementParams): Promise<JFormElement>
-  updateAttributeFormElements(params: JFormUpdateElementsParams): Promise<JFormResult[]>
-  updateDatabaseFormEntries(params: JFormUpdateElementsParams): Promise<JFormElement[]>
-  deleteDatabaseFormEntries(params: JFormElements): Promise<JDeleteEntriesResult>
-  // DIALOG METHODS (UI)
-  getAllFormsMetaDataForCurrentLayer(): JFormMetaData[]
-  getFormMetaDataByIdForCurrentLayer(formId: JId): JFormMetaData
-  hasDisplayedForm(): boolean
-  getDisplayedForm(): JForm
-  resetDisplayedForm(): void
-  setActiveTabIndex(tabIndex: number): void
-  getActiveTabIndex(): number
-  hasAttributeForm(): boolean
-  getAttributeForm(): JForm
-  getExternalForms(): JForm[]
-  getSubForms(): JForm[]
-  openCreationDialogForLayer(layerId: JId, geometry: GeoJSON.Geometry): Promise<JFormMetaData[]>
-  openUpdateDialogForLayer(layerId: JId, elements: JFormElement[]): Promise<JFormMetaData[]>
-  openCreationDialogForSubForm(subFormId: JId, selectedParentElements: JFormElement[]): JFormMetaData
-  openUpdateDialogForSubForm(subFormId: JId, subFormElements: JFormElement[]): JFormMetaData
-  closeCurrentDisplayedDialog(): void
-  getFormValues(form: JForm, initialData?: JAttributeValueByName): JAttributeValueByName
-  setFormValues(form: JForm, attributeValueByName: JAttributeValueByName): JFormErrors
-  submit(params?: JFormSubmitParams): Promise<JFormSubmitResult>
-  getNextViewId(): number
-  incrementNextViewId(): void
-  processRule(rule: any, data: any): any
-  canCreateElementOnForm(params: JFormId): boolean
-  canUpdateElementOnForm(params: JFormId): boolean
-  canDeleteElementOnForm(params: JFormId): boolean
-  hasEditOwnRightsForAllElements(params: JFormElements): boolean
-  isOwnPermissionRespectedForAllElements(layerId: JId, elements: JFormElement[]): boolean
-  // PHOTOS
-  hasDisplayedFormAPhotoField(): boolean
-  getDisplayedFormPhotos(): JPhoto[]
-  addDisplayedFormPhoto(photo: JPhoto): JId
-  updateDisplayedFormPhoto(params: JFormPhotoUpdate): void
-  removeDisplayedFormPhotoById(photoId: JId): void
-  // PURE FORM METHODS (not integrated, also used by query service)
-  checkAndCorrectSchemas(schema: JFormSchema, uiSchema: JFormUISchema): void
-  getDefaultValues(formMetaData: JFormMetaData, initialData?: JAttributeValueByName): JAttributeValueByName
-  getPreparedData(formMetaData: JFormMetaData, data: JAttributeValueByName): JAttributeValueByName
-  validateData(formMetaData: JFormMetaData, data: JAttributeValueByName): JFormErrors
-}
-
 export interface JHistoryService {
   transformSearchParamsIntoHashParams(paramNames: string | string[]): void
   goBack(): void
@@ -752,8 +686,6 @@ export interface JLayerService {
   setLayerGroupExpansion(layerGroupId: JId, isExpanded: boolean): void
   setLayerGroupsExpansion(params: JLayerSetLayerGroupsExpansionParams[]): void
   deleteLayer(layerId: JId): void
-  hasInformationReport(layerId: JId): boolean
-  openInformationReportInNewTab(layerId: JId, featureIds: JId[]): Promise<string>
   getDataSourceAttributes(layerId: JId): Promise<JAttribute[]>
 }
 
@@ -857,7 +789,6 @@ export interface JMouseOverService {
   openPopupForSelection(params: JMouseOverOpenPopupForSelectionParams): void
   renderForFeaturesAtLocation(containerId: string, location: JLocation): boolean // return true if has mouseover
   renderForFeaturesSelection(containerId: string, selection: JMapSelection, location?: JLocation): boolean // return true if has mouseover
-  openInformationReportInNewTab(layerId: JId): Promise<string>
 }
 
 export interface JExtensionService {

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "jmapcloud-ng-core-types",
-  "version": "2.0.14-qa.5",
+  "version": "2.0.14-qa.6",
   "description": "JMap Cloud specific version of JMap Cloud NG Core types and interfaces",
   "main": "index.js",
   "types": "ambient.d.ts",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
     "update-types-bridge": "node build/codemod-export-globals.js && node build/auto-add-imports.js && node build/generate-ambient.js && node ../../../node_modules/prettier/bin/prettier.cjs --write public/global-aliases.d.ts ambient.d.ts",
     "pub-github": "npm run update-types-bridge && node build/buildfile.js publish-github;",
     "doc-test": "npm run update-types-bridge && node build/buildfile.js doc-test;"