Add event and event series entities #4868

pacodelcastillolopez · 2024-07-16T07:49:07Z

Adding two new ANET entities: event series and events.

They have a host organization that can be any organization in ANET and an admin organization which needs to be managed by the user creating the event series or event (superuser or admin).
Events have also a location, start date and end date and are searchable.
Objectives can be linked to events.
Reports can be associated to events. When creating from the Event page it will inherit its location and objectives, the date of the report has to be within the start and end date of the event.
Events will be displayed in the organization and location pages.

To do:

Add testing once implementation is approved.
Add blocking feature (flag in an event that can block a location for the period the event takes place)
Add attachments to events (will be done together with adding avatar to events)

Closes AB#1064

User changes

Can search for events in ANET.
Can associate a report to an event.

Superuser changes

Can create event series and events managed by the organizations they manage.
Can see the event series and events they manage under "My Events".

Admin changes

Can create event series and events managed by any organization.

System admin changes

anet.yml or anet-dictionary.yml needs change
db needs migration
documentation has changed
graphql schema has changed

Checklist

azure-boards · 2024-07-16T11:30:05Z

✅ Successfully linked to Azure Boards work item(s):

Issue 1064

src/main/resources/migrations.xml

src/main/java/mil/dds/anet/resources/EventSeriesResource.java

src/main/java/mil/dds/anet/resources/EventResource.java

src/main/java/mil/dds/anet/search/AbstractEventSearcher.java

client/src/components/aggregations/utils.js

gjvoosten · 2024-08-21T14:11:29Z

client/src/components/aggregations/utils.js

+        title,
+        start,
+        end,
+        url: Event.pathFor(event),


Maybe use different colours for the different types of events, like for reports, where we have:

classNames: [`event-${Report.getStateForClassName(r)}`],

?

src/main/java/mil/dds/anet/utils/FkDataLoaderKey.java

gjvoosten · 2024-11-07T07:43:54Z

src/main/java/mil/dds/anet/beans/search/EventSearchQuery.java

+  @GraphQLQuery
+  @GraphQLInputField
+  Instant includeDate;


includeDate appears to be unused; can it be removed?

gjvoosten · 2024-11-07T11:42:45Z

client/src/pages/searches/Search.js

@@ -1660,6 +1760,30 @@ const Search = ({
          />
        </Fieldset>
      )}
+      {queryTypes.includes(SEARCH_OBJECT_TYPES.EVENTS) && (


You should not show Events search results when the withEmail filter is active.

gjvoosten · 2024-11-12T11:17:19Z

client/src/index.css

+  .event-collection header {
+    margin-bottom: 18px;
+  }
+
+  .event-collection footer {
+    margin-top: 18px;
+  }
+
+  .event-summary {
+    margin-top: 25px;
+    padding-top: 15px;
+    box-shadow: 0 1px 3px hsla(0, 0%, 0%, 0.15);
+  }


This appears to be the exact same styling already present in the main stylesheet above. Why is this here as well?

gjvoosten · 2024-11-12T11:18:49Z

client/src/pages/events/Show.js

+import { connect } from "react-redux"
+import { useLocation, useParams } from "react-router-dom"
+import Settings from "settings"
+import { FORMAT_TABLE } from "../../components/ReportCollection"


Please import directly from "components/ReportCollection" (joined with the import several lines above).

gjvoosten · 2024-11-12T11:20:05Z

src/test/java/mil/dds/anet/test/TestData.java

-import mil.dds.anet.test.client.PositionType;
-import mil.dds.anet.test.client.Status;
-import mil.dds.anet.test.client.TaskInput;
+import mil.dds.anet.test.client.*;


Please avoid wildcard imports.

gjvoosten · 2024-11-12T11:20:31Z

src/test/java/mil/dds/anet/test/resources/EventResourceTest.java

+import java.time.Instant;
+import java.util.Collections;
+import mil.dds.anet.test.TestData;
+import mil.dds.anet.test.client.*;


Please avoid wildcard imports.

gjvoosten · 2024-11-12T12:22:39Z

client/src/pages/events/Show.js

+                }
+                action={action}
+              />
+              <Fieldset id="info" tile="Info">


Where is the status field?

gjvoosten · 2024-11-12T12:23:16Z

client/src/pages/events/Form.js

+            <Messages error={saveError} />
+            <Form className="form-horizontal" method="post">
+              <Fieldset title={title} action={action} />
+              <Fieldset>


Where is the status field?

We might want to discuss what is the use case to decide events are active or inactive like People or Organizations, I dont think it makes any sense for events that happened in the past that you can go to edit them and make them inactive. That means they do not show up anymore in searches?

Same for events in the future, if an event gets cancelled maybe we should have the option to delete them or have a "Cancelled" status. The status field, as it is used, for other entities does not really apply that well to events.

gjvoosten · 2024-11-12T12:23:37Z

client/src/pages/eventSeries/Show.js

+                }
+                action={action}
+              />
+              <Fieldset id="info" title="Info">


Where is the status field?

gjvoosten · 2024-11-12T12:24:00Z

client/src/pages/eventSeries/Form.js

+            <Messages error={error} />
+            <Form className="form-horizontal" method="post">
+              <Fieldset title={title} action={action} />
+              <Fieldset>


Where is the status field?

gjvoosten · 2024-11-12T12:25:19Z

client/src/components/previews/EventPreview.js

+  return (
+    <div className={`report-preview preview-content-scroll ${className || ""}`}>
+      <h4 className="ellipsized-text">Event {eventTitle}</h4>
+      <div className="preview-section">


Where are the status and description fields?

It is a preview, I do not think we want to have description there in my opinion.

gjvoosten · 2024-11-12T12:25:38Z

client/src/components/previews/EventSeriesPreview.js

+  return (
+    <div className={`report-preview preview-content-scroll ${className || ""}`}>
+      <h4 className="ellipsized-text">Event Series {eventSeriesTitle}</h4>
+      <div className="preview-section">


Where are the status and description fields?

It is a preview, I do not think we want to have description there in my opinion.

Other previews show the profile/description/biography as well.

Great, I still dont think this one should.

pacodelcastillolopez added the feature label Jul 16, 2024

pacodelcastillolopez changed the title ~~Addind event and event series entities~~ Adding event and event series entities Jul 16, 2024

pacodelcastillolopez requested a review from gjvoosten July 16, 2024 11:31

gjvoosten changed the title ~~Adding event and event series entities~~ Add event and event series entities Jul 16, 2024

pacodelcastillolopez force-pushed the AB-1064_events_entities branch from 5eee26d to 1478551 Compare August 19, 2024 15:15

gjvoosten requested changes Aug 21, 2024

View reviewed changes

gjvoosten reviewed Aug 21, 2024

View reviewed changes

src/main/java/mil/dds/anet/search/AbstractEventSearcher.java Outdated Show resolved Hide resolved

gjvoosten reviewed Aug 21, 2024

View reviewed changes

src/main/java/mil/dds/anet/search/AbstractEventSearcher.java Outdated Show resolved Hide resolved

gjvoosten requested changes Aug 21, 2024

View reviewed changes

src/main/java/mil/dds/anet/search/AbstractEventSearcher.java Outdated Show resolved Hide resolved

client/src/components/aggregations/utils.js Outdated Show resolved Hide resolved

client/src/components/aggregations/utils.js Outdated Show resolved Hide resolved

gjvoosten reviewed Aug 21, 2024

View reviewed changes

pacodelcastillolopez force-pushed the AB-1064_events_entities branch 2 times, most recently from a3abfe2 to de19400 Compare October 8, 2024 07:43

gjvoosten force-pushed the AB-1064_events_entities branch from 1317b51 to ee1028f Compare October 8, 2024 11:23

pacodelcastillolopez force-pushed the AB-1064_events_entities branch 2 times, most recently from 29b80f4 to 948880d Compare October 8, 2024 11:42

gjvoosten reviewed Oct 30, 2024

View reviewed changes

src/main/java/mil/dds/anet/utils/FkDataLoaderKey.java Outdated Show resolved Hide resolved

pacodelcastillolopez force-pushed the AB-1064_events_entities branch from 948880d to b58c5d3 Compare November 5, 2024 09:12

gjvoosten force-pushed the AB-1064_events_entities branch 3 times, most recently from b782c1e to 2044b1c Compare November 5, 2024 14:22

gjvoosten reviewed Nov 7, 2024

View reviewed changes

pacodelcastillolopez force-pushed the AB-1064_events_entities branch 7 times, most recently from b63f436 to edaf108 Compare November 11, 2024 08:51

gjvoosten reviewed Nov 12, 2024

View reviewed changes

client/src/pages/events/Show.js Outdated

}

action={action}

/>

<Fieldset id="info" tile="Info">

Copy link

Collaborator

gjvoosten Nov 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is the status field?

gjvoosten reviewed Nov 12, 2024

View reviewed changes

gjvoosten force-pushed the AB-1064_events_entities branch 3 times, most recently from 15168e6 to 8349397 Compare November 26, 2024 16:06

gjvoosten and others added 9 commits November 27, 2024 14:22

Prevent React warning about 'key' in props spread

cdc54a7

AB#1064 Add events

d940e43

AB#1172 Add visit bans in locations

a856de0

AB#1173 Add events matrix

b51038a

AB#1064 Show breadcrumb trail for event tasks

b0a5cc0

AB#1064 Retrieve all necessary fields

cde4ce5

AB#1064 Events and Event Series don't have email addresses

bb997bc

AB#1064 Remove unused props

3246925

AB#1064 fixes and test coverage

21fc88e

gjvoosten force-pushed the AB-1064_events_entities branch from 8349397 to 21fc88e Compare November 27, 2024 13:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add event and event series entities #4868

Add event and event series entities #4868

pacodelcastillolopez commented Jul 16, 2024 •

edited by gjvoosten

Loading

azure-boards bot commented Jul 16, 2024

gjvoosten Aug 21, 2024

gjvoosten Nov 7, 2024

gjvoosten Nov 7, 2024

gjvoosten Nov 12, 2024

gjvoosten Nov 12, 2024

gjvoosten Nov 12, 2024

gjvoosten Nov 12, 2024

gjvoosten Nov 12, 2024

gjvoosten Nov 12, 2024

pacodelcastillolopez Nov 12, 2024

gjvoosten Nov 12, 2024

gjvoosten Nov 12, 2024

gjvoosten Nov 12, 2024

pacodelcastillolopez Nov 12, 2024

gjvoosten Nov 12, 2024

pacodelcastillolopez Nov 12, 2024

gjvoosten Nov 12, 2024

pacodelcastillolopez Nov 12, 2024

Add event and event series entities #4868

Are you sure you want to change the base?

Add event and event series entities #4868

Conversation

pacodelcastillolopez commented Jul 16, 2024 • edited by gjvoosten Loading

User changes

Superuser changes

Admin changes

System admin changes

Checklist

azure-boards bot commented Jul 16, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pacodelcastillolopez commented Jul 16, 2024 •

edited by gjvoosten

Loading