remove planningActivity and comment leaflet ruler, select, timeline

client/index.html

@@ -7,9 +7,9 @@
   <link rel='shortcut icon' href='/static/favicon.ico' />
   <link rel='stylesheet' href='/static/leaflet.css' />
   <link rel="stylesheet" href="/static/flatpickr/flatpickr.min.css">
-  <link rel='stylesheet' href='/static/leaflet/select/leaflet.select.css' />
+  <!-- <link rel='stylesheet' href='/static/leaflet/select/leaflet.select.css' />
   <link rel='stylesheet' href='/static/leaflet/ruler/leaflet.ruler.css' />
-  <link rel='stylesheet' href='/static/leaflet/timeline/leaflet.timeline.css' />
+  <link rel='stylesheet' href='/static/leaflet/timeline/leaflet.timeline.css' /> -->
   <meta name='viewport' content='width=device-width, initial-scale=1, shrink-to-fit=no' />
   <meta name='theme-color' content='#000000' />
 
@@ -48,7 +48,7 @@
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
 </body>
-  <script type="module" src='/static/leaflet/timeline/leaflet.timeline.js'></script>
+  <!-- <script type="module" src='/static/leaflet/timeline/leaflet.timeline.js'></script>
   <script type="module" src='/static/leaflet/select/leaflet.select.js'></script> 
-  <script type="module" src='/static/leaflet/ruler/leaflet.ruler.js'></script>
+  <script type="module" src='/static/leaflet/ruler/leaflet.ruler.js'></script> -->
 </html>

client/src/Components/local/form-elements/message-creator/index.tsx

@@ -34,8 +34,7 @@ const MessageCreator: React.FC<PropTypes> = ({
   clearCachedCreatorMessage,
   draftMessage,
   modifyForEdit,
-  modifyForSave,
-  editCallback
+  modifyForSave
 }) => {
   const privateMessageRef = createRef<HTMLTextAreaElement>()
   const [formMessage, setFormMessage] = useState<any>()
@@ -167,7 +166,6 @@ const MessageCreator: React.FC<PropTypes> = ({
         messageContent={messageContent}
         modifyForEdit={modifyForEdit}
         modifyForSave={modifyForSave}
-        editCallback={editCallback}
       />
       {privateMessage && (
         <div className="flex-content form-group">

client/src/Components/local/form-elements/message-creator/types/props.d.ts

@@ -1,6 +1,5 @@
 import { ChannelTypes, CoreMessage, ForceData, MessageDetails, MessageStructure } from 'src/custom-types'
 import { MouseEvent } from 'react'
-import { EditCallback } from 'src/local/molecules/json-editor/helpers/setupEditor'
 
 export default interface PropTypes {
   schema: any
@@ -41,8 +40,4 @@ export default interface PropTypes {
    */
   modifyForSave?: { (document: Record<string, any>): Record<string, any> }
 
-  /**
-   *  user has clicked on custom edit button
-   */
-  editCallback?: EditCallback
 }

client/src/Components/local/form-elements/new-message/index.tsx

@@ -29,8 +29,7 @@ const NewMessage: React.FC<PropTypes> = ({
   title,
   hideTemplateSelector,
   modifyForEdit,
-  modifyForSave,
-  editCallback
+  modifyForSave
 }) => {
   const prevTemplates: TemplateBody = usePrevious(templates)
   const [selectedSchema, setSelectedSchema] = useState<Record<string, any> | null>(null)
@@ -154,7 +153,6 @@ const NewMessage: React.FC<PropTypes> = ({
           draftMessage={draftMessage}
           modifyForEdit={modifyForEdit}
           modifyForSave={modifyForSave}
-          editCallback={editCallback}
         />
       </Collapsible>
     </div>

client/src/Components/local/form-elements/new-message/types/props.d.ts

@@ -1,5 +1,4 @@
 import { ChannelTypes, CoreMessage, ForceData, MessageDetails, MessageStructure, TemplateBody } from 'src/custom-types'
-import { EditCallback } from 'src/local/molecules/json-editor/helpers/setupEditor'
 
 export default interface PropTypes {
   orderableChannel: boolean
@@ -45,8 +44,4 @@ export default interface PropTypes {
    *  modify document prior to being stored
    */
   modifyForSave?: { (document: Record<string, any>): Record<string, any> }
-  /**
-   *  user has clicked on custom edit button
-   */
-  editCallback?: EditCallback
 }

client/src/Components/local/molecules/json-editor/helpers/setupEditor.ts

@@ -1,22 +1,19 @@
 import { JSONEditor } from '@json-editor/json-editor'
-import { Editor, PlannedActivityGeometry } from 'src/custom-types'
+import { Editor } from 'src/custom-types'
 import { RefObject } from 'react'
-import { initLocationEditor } from '../custom-editors/location-editor'
 import { configDateTimeCustomValidation } from './jsonValidation'
 
-export type EditCallback = (locations: PlannedActivityGeometry[]) => void
 export type OnLocationEditorLoaded = (editorElm: HTMLDivElement) => void
 
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 const setupEditor = (editor: Editor | null, schema: any, ref: RefObject<HTMLDivElement>,
-  jsonEditorConfig: Record<string, any>, editCallback: EditCallback, onLocationEditorLoaded: OnLocationEditorLoaded,
+  jsonEditorConfig: Record<string, any>, 
   showErrorsMode?: string): Editor | null => {
   if (editor !== null) {
     editor.destroy()
     editor = null
   }
 
-  initLocationEditor(editCallback, onLocationEditorLoaded)
   configDateTimeCustomValidation()
 
   const disableCollapse = 'disable_collapse'

client/src/Components/local/molecules/json-editor/index.tsx

@@ -1,4 +1,4 @@
-import { Editor, PlannedActivityGeometry, TemplateBody } from 'src/custom-types'
+import { Editor, TemplateBody } from 'src/custom-types'
 import { configDateTimeLocal, deepCopy, usePrevious } from 'src/Helpers'
 import 'bootstrap/dist/css/bootstrap.min.css'
 import { isEqual } from 'lodash'
@@ -32,9 +32,7 @@ export const JsonEditor: React.FC<Props> = ({
   onCancelEdit,
   modifyForSave,
   confirmCancel = false,
-  viewSaveButton = false,
-  editCallback,
-  onLocationEditorLoaded
+  viewSaveButton = false
 }) => {
   const jsonEditorRef = useRef<HTMLDivElement>(null)
   const [editor, setEditor] = useState<Editor | null>(null)
@@ -56,7 +54,6 @@ export const JsonEditor: React.FC<Props> = ({
   const destroyEditor = (editorObject: Editor | null): void => {
     if (editorObject && (editorObject.ready || !editorObject.destroyed)) { editorObject.destroy() }
   }
-
   const fixDate = (value: { [property: string]: any }): { [property: string]: any } => {
     const cleanDate = (date: string): string => {
       if (!date.includes('Z')) {
@@ -134,17 +131,6 @@ export const JsonEditor: React.FC<Props> = ({
     }
   }
 
-  const localEditCallback = (locations: PlannedActivityGeometry[]): void => {
-    // TODO: we should only call the `editCallback` if this document
-    // is being edited.  The `beingEdited` flag should specify this,
-    // but it is always false
-    editCallback && editCallback(locations)
-  }
-
-  const onEditorLoaded = (editorElm: HTMLDivElement) => {
-    onLocationEditorLoaded && onLocationEditorLoaded(editorElm)
-  }
-
   const initEditor = (): () => void => {
     const hideArrayButtons = disabled
     const jsonEditorConfig = hideArrayButtons
@@ -160,7 +146,7 @@ export const JsonEditor: React.FC<Props> = ({
 
     // if a title was supplied, replace the title in the schema
     const schemaWithTitle = title ? { ...customizedSchema, title: title } : customizedSchema
-    const nextEditor = setupEditor(editor, schemaWithTitle, jsonEditorRef, jsonEditorConfig, localEditCallback, onEditorLoaded, alwaysShowEditorErrors)
+    const nextEditor = setupEditor(editor, schemaWithTitle, jsonEditorRef, jsonEditorConfig, alwaysShowEditorErrors)
 
     const changeListenter = (): void => {
       if (nextEditor) {

client/src/Components/local/molecules/json-editor/types/props.d.ts

@@ -1,5 +1,4 @@
 import { MessageCustom, MessageStructure, TemplateBody, TempletCreatorBody } from 'src/custom-types'
-import { EditCallback } from '../helpers/setupEditor'
 
 export default interface Props {
   onChange?: (nextMessage: MessageCustom) => void
@@ -73,10 +72,4 @@ export default interface Props {
    */
   modifyForSave?: { (document: Record<string, any>): Record<string, any> }
 
-  /**
-   *  user has clicked on custom edit button
-   */
-  editCallback?: EditCallback
-
-  onLocationEditorLoaded?: (editorElm: HTMLDivElement) => void
 }

client/src/config/enums.ts

@@ -22,15 +22,6 @@ export enum CollaborativePermission {
   CanUnClaim
 }
 
-/** 
- * the type of geometry that can represent planning activities
- */
-export enum GeometryType {
-  point = 'Point',
-  polyline = 'Polyline',
-  polygon = 'Polygon'
-}
-
 /** the initial state for new messages in a collab edit channel */
 export enum InitialStates {
   PENDING_REVIEW = 'PENDING_REVIEW',

client/src/custom-types/index.ts

@@ -31,7 +31,6 @@ export {
 } from './message.d'
 export { MessagesActionTypes, MessagesDispatch, SetCurrentViewFromURI } from './messages-action.d'
 export * from './participant.d'
-export * from './planning-activity.d'
 export * from './player-log-actions.d'
 export * from './player-log.d'
 export * from './player-ui-actions.d'