Skip to content
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

Add event and event series entities #4868

Open
wants to merge 40 commits into
base: main
Choose a base branch
from

Conversation

pacodelcastillolopez
Copy link
Collaborator

@pacodelcastillolopez pacodelcastillolopez commented Jul 16, 2024

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, location and objective pages. In addition, the objective page shows an event matrix.

Closes AB#1064, AB#1172, AB#1173

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:
    […]
    regularUsersCanCreateLocations: true
    engagementsIncludeTimeAndDuration: true
    eventsIncludeStartAndEndTime: true
    
    […]
    
    fields:
      […]
    
      eventSeries:
        status:
          label: Status
        hostOrg:
          label: Host Organization
          placeholder: Search for the organization hosting the event series…
        adminOrg:
          label: Admin Organization
          placeholder: Search for the organization that will manage the event series in ANET…
        name:
          label: Name
          placeholder: The name of the event series
        description:
          label: Description
          placeholder: The description of the event series
    
      event:
        status:
          label: Status
        eventSeries:
          label: Event Series this event belongs to
          placeholder: Search for an event series…
        hostOrg:
          label: Host Organization
          placeholder: Search for the organization hosting the event…
        adminOrg:
          label: Admin Organization
          placeholder: Search for the organization that will manage the event in ANET…
        location:
          label: Location where the event takes place
          placeholder: Search for a location…
        type:
          label: Type
          placeholder: The type of the event
        name:
          label: Name
          placeholder: The name of the event
        description:
          label: Description
          placeholder: The description of the event
        startDate:
          label: Start Date
          placeholder: The start date of the event
        endDate:
          label: End Date
          placeholder: The end date of the event
        outcomes:
          label: Outcomes
          placeholder: The outcomes of the event
        organizations:
          label: Organizations attending
          placeholder: Organizations attending the event
        people:
          label: People attending
          placeholder: People attending the event
        tasks:
          label: Objectives
          placeholder: Objectives of the event
    
      […]
    
      report:
        […]
        event:
          label: Event
          placeholder: Was the engagement part of an event?
          filter: [CONFERENCE, EXERCISE, VISIT_BAN, OTHER]
        customFields:
          […]
  • db needs migration
  • documentation has changed
  • graphql schema has changed

Checklist

  • Described the user behavior in PR body
  • Referenced/updated all related issues
  • commits follow a repo#issue: Title title format and these 7 rules
  • commits have a clean history, otherwise PR may be squash-merged
  • Added and/or updated unit tests
  • Added and/or updated e2e tests
  • Added and/or updated data migrations
  • Updated documentation
  • Resolved all build errors and warnings
  • Opened debt issues for anything not resolved here

@pacodelcastillolopez pacodelcastillolopez changed the title Addind event and event series entities Adding event and event series entities Jul 16, 2024
Copy link

azure-boards bot commented Jul 16, 2024

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

@gjvoosten gjvoosten changed the title Adding event and event series entities Add event and event series entities Jul 16, 2024
src/main/resources/migrations.xml Outdated Show resolved Hide resolved
src/main/resources/migrations.xml Outdated Show resolved Hide resolved
src/main/resources/migrations.xml Outdated Show resolved Hide resolved
src/main/resources/migrations.xml Outdated Show resolved Hide resolved
src/main/resources/migrations.xml Outdated Show resolved Hide resolved
src/main/java/mil/dds/anet/resources/EventResource.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
@pacodelcastillolopez pacodelcastillolopez force-pushed the AB-1064_events_entities branch 2 times, most recently from a3abfe2 to de19400 Compare October 8, 2024 07:43
@gjvoosten gjvoosten force-pushed the AB-1064_events_entities branch from 1317b51 to ee1028f Compare October 8, 2024 11:23
@pacodelcastillolopez pacodelcastillolopez force-pushed the AB-1064_events_entities branch 2 times, most recently from 29b80f4 to 948880d Compare October 8, 2024 11:42
@gjvoosten gjvoosten force-pushed the AB-1064_events_entities branch 3 times, most recently from b782c1e to 2044b1c Compare November 5, 2024 14:22
@pacodelcastillolopez pacodelcastillolopez force-pushed the AB-1064_events_entities branch 7 times, most recently from b63f436 to edaf108 Compare November 11, 2024 08:51
Also simplify some other autocomplete queries.
Separate the EventMatrix from the EventCollection, and add both to the
task show page.
Extend the matrix with event series and all (sub-)tasks of the current
task.
If a report is related to an event, add a task filter for the
event-related tasks, but don't pre-select any tasks on the report.
Don't show recent locations if an event has been selected.
Remove unused customFields from tasks in event queries.
@gjvoosten gjvoosten force-pushed the AB-1064_events_entities branch from 02005b9 to 3739714 Compare January 16, 2025 15:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants