Skip to content
This repository has been archived by the owner on Oct 20, 2023. It is now read-only.

WIP GRAPH 3: Custom Shapes and Colors #118

Merged
merged 69 commits into from
Jul 26, 2023

Conversation

arniebradfo
Copy link
Collaborator

@arniebradfo arniebradfo commented Apr 1, 2023

Description

This adds the option to select from a set of polygon representations for each beacon node, and add color to all nodes. see screenshots.

TODOs

  • Add mobx and server state state for saving custom shape and className data for nodes
  • Add graph styles once nodes can be customized

Testing

...

Screenshots

Screen Shot 2023-04-07 at 12 01 48 PM
Screen Shot 2023-04-07 at 12 02 03 PM
Screen Shot 2023-04-07 at 12 02 31 PM
Screen Shot 2023-04-07 at 12 02 34 PM
Screen Shot 2023-04-07 at 12 03 00 PM
Screen Shot 2023-03-31 at 5 49 32 PM
Screen Shot 2023-03-31 at 5 50 00 PM

@arniebradfo arniebradfo changed the title GRAPH 3: Custom Shapes and Colors WIP GRAPH 3: Custom Shapes and Colors Apr 1, 2023
@arniebradfo arniebradfo marked this pull request as draft April 2, 2023 21:10
@arniebradfo arniebradfo changed the base branch from graph-server-node-render to develop April 7, 2023 19:14
@GoldingAustin
Copy link
Collaborator

@arniebradfo I added shapes and colors to the beacon, host, and server meta-objects. They can be updated in their meta mutations

James Bradford and others added 2 commits April 11, 2023 10:00
@@ -141,6 +151,7 @@ export const parsingOrchestratorMachine = createMachine(
ip,
os: findOsFromMetaLine(metadataLog.blob),
host: metadataLog.beacon?.host as Host,
shape: Shapes.circle,
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@GoldingAustin I had to add shape: Shapes.circle here in hostMeta and in beaconMeta. Not sure why its marked as required?

@@ -31,7 +31,7 @@ export class HostResolvers {
@Arg('hostDisplayName', () => String) hostDisplayName: string,
@Arg('shape', { nullable: true }) shape?: Shapes,
@Arg('color', { nullable: true }) color?: string,
@RelationPath() relationPaths: Relation<Host>
@RelationPath() relationPaths?: Relation<Host>
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@GoldingAustin, This was giving me an error that A required parameter cannot follow an optional parameter. ts(1016) so I made it optional?

@@ -483,7 +483,7 @@ type Query {
logsByBeaconId(beaconId: String!, campaignId: String!): [LogEntry!]!

""""""
nonHidableEntities(beaconIds: [String!] = [], campaignId: String!, hostIds: [String!] = []): NonHidableEntities!
nonHidableEntities(beaconIds: [String!]! = [], campaignId: String!, hostIds: [String!]! = []): NonHidableEntities!
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@GoldingAustin, this just updated itself on build

@arniebradfo
Copy link
Collaborator Author

@GoldingAustin & @sharplessHQ, I think I did an okay job merging in develop 489b1d9, but some of the file changes in Beacon.tsx and Host.tsx were not automatically carried over because git did not track the file rename to BeaconRow.tsx and HostOrServerRow.tsx respectively. I copied these over manually, but it was hard to know if I merged them correctly. This may need a review.

Add graph update on selection and initial load
@GoldingAustin GoldingAustin marked this pull request as ready for review June 23, 2023 22:26
@GoldingAustin GoldingAustin merged commit 1d56aac into develop Jul 26, 2023
@GoldingAustin GoldingAustin deleted the BLDSTRIKE-457-graph-custom-icons-classes branch July 26, 2023 01:39
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants