diff --git a/pkg/adhoc/server/convert.go b/pkg/adhoc/server/convert.go index 9f40e8b559..163ffa5a2f 100644 --- a/pkg/adhoc/server/convert.go +++ b/pkg/adhoc/server/convert.go @@ -5,6 +5,7 @@ import ( "encoding/json" "errors" "fmt" + "sort" "strconv" "time" @@ -79,3 +80,47 @@ func collapsedToProfile(b []byte, name string, maxNodes int) (*flamebearer.Flame profile := flamebearer.NewProfile(out, maxNodes) return &profile, nil } + +func profileToTree(fb flamebearer.FlamebearerProfile) (*tree.Tree, error) { + if fb.Metadata.Format != string(tree.FormatSingle) { + return nil, fmt.Errorf("unsupported flamebearer format %s", fb.Metadata.Format) + } + return flamebearerV1ToTree(fb.Flamebearer) +} + +func flamebearerV1ToTree(fb flamebearer.FlamebearerV1) (*tree.Tree, error) { + t := tree.New() + deltaDecoding(fb.Levels, 0, 4) + for i, l := range fb.Levels { + for j := 0; j < len(l); j += 4 { + self := l[j+2] + if self > 0 { + t.InsertStackString(buildStack(fb, i, j), uint64(self)) + } + } + } + return t, nil +} + +func deltaDecoding(levels [][]int, start, step int) { + for _, l := range levels { + prev := 0 + for i := start; i < len(l); i += step { + delta := l[i] + l[i+1] + l[i] += prev + prev += delta + } + } +} + +func buildStack(fb flamebearer.FlamebearerV1, level, idx int) []string { + stack := make([]string, level+1) + stack[level] = fb.Names[fb.Levels[level][idx+3]] + x := fb.Levels[level][idx] + for i := level - 1; i >= 0; i-- { + j := sort.Search(len(fb.Levels[i])/4, func(j int) bool { return fb.Levels[i][j*4] > x }) - 1 + stack[i] = fb.Names[fb.Levels[i][j*4+3]] + x = fb.Levels[i][j*4] + } + return stack +} diff --git a/pkg/adhoc/server/server.go b/pkg/adhoc/server/server.go index 571a52bd4a..ab4fdd61cf 100644 --- a/pkg/adhoc/server/server.go +++ b/pkg/adhoc/server/server.go @@ -16,6 +16,7 @@ import ( "github.com/sirupsen/logrus" "github.com/pyroscope-io/pyroscope/pkg/adhoc/util" + "github.com/pyroscope-io/pyroscope/pkg/storage" "github.com/pyroscope-io/pyroscope/pkg/structs/flamebearer" ) @@ -50,7 +51,7 @@ func (s *server) AddRoutes(r *mux.Router) http.HandlerFunc { if s.enabled { r.HandleFunc("/v1/profiles", s.Profiles) r.HandleFunc("/v1/profile/{id:[0-9a-f]+}", s.Profile) - r.HandleFunc("/v1/diff/{id1[0-9a-f]+}/{id2[0-9a-f]+}", s.Diff) + r.HandleFunc("/v1/diff/{left:[0-9a-f]+}/{right:[0-9a-f]+}", s.Diff) } return r.ServeHTTP } @@ -126,8 +127,67 @@ func (s *server) Profile(w http.ResponseWriter, r *http.Request) { } } -// TODO(abeaumont) -func (*server) Diff(_ http.ResponseWriter, _ *http.Request) { +// Diff retrieves two different local files identified by their IDs and builds a profile diff. +func (s *server) Diff(w http.ResponseWriter, r *http.Request) { + lid := mux.Vars(r)["left"] + rid := mux.Vars(r)["right"] + s.mtx.RLock() + lp, lok := s.profiles[lid] + rp, rok := s.profiles[rid] + s.mtx.RUnlock() + if !lok { + s.log.WithField("id", lid).Warning("Profile does not exist") + http.Error(w, "Not Found", http.StatusNotFound) + return + } + if !rok { + s.log.WithField("id", rid).Warning("Profile does not exist") + http.Error(w, "Not Found", http.StatusNotFound) + return + } + lfb, err := s.convert(lp) + if err != nil { + s.log.WithError(err).Error("Unable to process left profile") + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + rfb, err := s.convert(rp) + if err != nil { + s.log.WithError(err).Error("Unable to process right profile") + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + // TODO(abeaumont): Validate that profiles are comparable + // TODO(abeaumont): Simplify profile generation + out := &storage.GetOutput{ + Tree: nil, + Units: lfb.Metadata.Units, + SpyName: lfb.Metadata.SpyName, + SampleRate: lfb.Metadata.SampleRate, + } + lt, err := profileToTree(*lfb) + if err != nil { + s.log.WithError(err).Error("Unable to convert profile to tree") + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + rt, err := profileToTree(*rfb) + if err != nil { + s.log.WithError(err).Error("Unable to convert profile to tree") + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + lOut := &storage.GetOutput{Tree: lt} + rOut := &storage.GetOutput{Tree: rt} + + fb := flamebearer.NewCombinedProfile(out, lOut, rOut, s.maxNodes) + w.Header().Set("Content-Type", "application/json") + if err := json.NewEncoder(w).Encode(fb); err != nil { + s.log.WithError(err).Error("Unable to encode the profile diff") + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } } type converterFn func(b []byte, name string, maxNodes int) (*flamebearer.FlamebearerProfile, error) diff --git a/pkg/storage/tree/tree.go b/pkg/storage/tree/tree.go index a8851f5431..c1ec361d08 100644 --- a/pkg/storage/tree/tree.go +++ b/pkg/storage/tree/tree.go @@ -127,6 +127,39 @@ func (n *treeNode) insert(targetLabel []byte) *treeNode { return n.ChildrenNodes[i] } +func (n *treeNode) insertString(targetLabel string) *treeNode { + i, j := 0, len(n.ChildrenNodes) + for i < j { + m := (i + j) >> 1 + for k, b := range []byte(targetLabel) { + if k >= len(n.ChildrenNodes[m].Name) || b > n.ChildrenNodes[m].Name[k] { + // targetLabel > n.ChildrenNodes[m].Name + i = m + 1 + break + } + if b < n.ChildrenNodes[m].Name[k] { + // targetLabel < n.ChildrenNodes[m].Name + j = m + break + } + if k == len(targetLabel)-1 { + if len(targetLabel) == len(n.ChildrenNodes[m].Name) { + // targetLabel == n.ChildrenNodes[m].Name + return n.ChildrenNodes[m] + } + // targetLabel < n.ChildrenNodes[m].Name + j = m + } + } + } + l := []byte(targetLabel) + child := newNode(l) + n.ChildrenNodes = append(n.ChildrenNodes, child) + copy(n.ChildrenNodes[i+1:], n.ChildrenNodes[i:]) + n.ChildrenNodes[i] = child + return n.ChildrenNodes[i] +} + func (t *Tree) InsertInt(key []byte, value int) { t.Insert(key, uint64(value)) } func (t *Tree) Insert(key []byte, value uint64) { @@ -146,6 +179,17 @@ func (t *Tree) Insert(key []byte, value uint64) { node.Total += value } +func (t *Tree) InsertStackString(stack []string, v uint64) { + n := t.root + for j := range stack { + n.Total += v + n = n.insertString(stack[j]) + } + // Leaf. + n.Total += v + n.Self += v +} + func (t *Tree) Iterate(cb func(key []byte, val uint64)) { nodes := []*treeNode{t.root} prefixes := make([][]byte, 1) diff --git a/pkg/storage/tree/tree_test.go b/pkg/storage/tree/tree_test.go index 82fd7cb228..c55c4dbafc 100644 --- a/pkg/storage/tree/tree_test.go +++ b/pkg/storage/tree/tree_test.go @@ -36,6 +36,146 @@ var _ = Describe("tree package", func() { }) }) + Context("InsertStackString unsorted of length 1", func() { + tree := New() + tree.InsertStackString([]string{"a", "b"}, uint64(1)) + tree.InsertStackString([]string{"a", "a"}, uint64(2)) + + It("properly sets up a tree", func() { + Expect(tree.root.ChildrenNodes).To(HaveLen(1)) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes).To(HaveLen(2)) + Expect(tree.root.ChildrenNodes[0].Self).To(Equal(uint64(0))) + Expect(tree.root.ChildrenNodes[0].Total).To(Equal(uint64(3))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[0].Self).To(Equal(uint64(2))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[1].Self).To(Equal(uint64(1))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[0].Total).To(Equal(uint64(2))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[1].Total).To(Equal(uint64(1))) + Expect(tree.String()).To(Equal("a;a 2\na;b 1\n")) + }) + }) + + Context("InsertStackString equal of length 1", func() { + tree := New() + tree.InsertStackString([]string{"a", "b"}, uint64(1)) + tree.InsertStackString([]string{"a", "b"}, uint64(2)) + + It("properly sets up a tree", func() { + Expect(tree.root.ChildrenNodes).To(HaveLen(1)) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes).To(HaveLen(1)) + Expect(tree.root.ChildrenNodes[0].Self).To(Equal(uint64(0))) + Expect(tree.root.ChildrenNodes[0].Total).To(Equal(uint64(3))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[0].Self).To(Equal(uint64(3))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[0].Total).To(Equal(uint64(3))) + Expect(tree.String()).To(Equal("a;b 3\n")) + }) + }) + + Context("InsertStackString sorted of length 1", func() { + tree := New() + tree.InsertStackString([]string{"a", "b"}, uint64(1)) + tree.InsertStackString([]string{"a", "c"}, uint64(2)) + + It("properly sets up a tree", func() { + Expect(tree.root.ChildrenNodes).To(HaveLen(1)) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes).To(HaveLen(2)) + Expect(tree.root.ChildrenNodes[0].Self).To(Equal(uint64(0))) + Expect(tree.root.ChildrenNodes[0].Total).To(Equal(uint64(3))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[0].Self).To(Equal(uint64(1))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[1].Self).To(Equal(uint64(2))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[0].Total).To(Equal(uint64(1))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[1].Total).To(Equal(uint64(2))) + Expect(tree.String()).To(Equal("a;b 1\na;c 2\n")) + }) + }) + + Context("InsertStackString sorted of different lengths", func() { + tree := New() + tree.InsertStackString([]string{"a", "b"}, uint64(1)) + tree.InsertStackString([]string{"a", "ba"}, uint64(2)) + + It("properly sets up a tree", func() { + Expect(tree.root.ChildrenNodes).To(HaveLen(1)) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes).To(HaveLen(2)) + Expect(tree.root.ChildrenNodes[0].Self).To(Equal(uint64(0))) + Expect(tree.root.ChildrenNodes[0].Total).To(Equal(uint64(3))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[0].Self).To(Equal(uint64(1))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[1].Self).To(Equal(uint64(2))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[0].Total).To(Equal(uint64(1))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[1].Total).To(Equal(uint64(2))) + Expect(tree.String()).To(Equal("a;b 1\na;ba 2\n")) + }) + }) + + Context("InsertStackString unsorted of different lengths", func() { + tree := New() + tree.InsertStackString([]string{"a", "ba"}, uint64(1)) + tree.InsertStackString([]string{"a", "b"}, uint64(2)) + + It("properly sets up a tree", func() { + Expect(tree.root.ChildrenNodes).To(HaveLen(1)) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes).To(HaveLen(2)) + Expect(tree.root.ChildrenNodes[0].Self).To(Equal(uint64(0))) + Expect(tree.root.ChildrenNodes[0].Total).To(Equal(uint64(3))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[0].Self).To(Equal(uint64(2))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[1].Self).To(Equal(uint64(1))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[0].Total).To(Equal(uint64(2))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[1].Total).To(Equal(uint64(1))) + Expect(tree.String()).To(Equal("a;b 2\na;ba 1\n")) + }) + }) + + Context("InsertStackString unsorted of length 2", func() { + tree := New() + tree.InsertStackString([]string{"a", "bb"}, uint64(1)) + tree.InsertStackString([]string{"a", "ba"}, uint64(2)) + + It("properly sets up a tree", func() { + Expect(tree.root.ChildrenNodes).To(HaveLen(1)) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes).To(HaveLen(2)) + Expect(tree.root.ChildrenNodes[0].Self).To(Equal(uint64(0))) + Expect(tree.root.ChildrenNodes[0].Total).To(Equal(uint64(3))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[0].Self).To(Equal(uint64(2))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[1].Self).To(Equal(uint64(1))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[0].Total).To(Equal(uint64(2))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[1].Total).To(Equal(uint64(1))) + Expect(tree.String()).To(Equal("a;ba 2\na;bb 1\n")) + }) + }) + + Context("InsertStackString equal of length 2", func() { + tree := New() + tree.InsertStackString([]string{"a", "bb"}, uint64(1)) + tree.InsertStackString([]string{"a", "bb"}, uint64(2)) + + It("properly sets up a tree", func() { + Expect(tree.root.ChildrenNodes).To(HaveLen(1)) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes).To(HaveLen(1)) + Expect(tree.root.ChildrenNodes[0].Self).To(Equal(uint64(0))) + Expect(tree.root.ChildrenNodes[0].Total).To(Equal(uint64(3))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[0].Self).To(Equal(uint64(3))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[0].Total).To(Equal(uint64(3))) + Expect(tree.String()).To(Equal("a;bb 3\n")) + }) + }) + + Context("InsertStackString sorted of length 2", func() { + tree := New() + tree.InsertStackString([]string{"a", "bb"}, uint64(1)) + tree.InsertStackString([]string{"a", "bc"}, uint64(2)) + + It("properly sets up a tree", func() { + Expect(tree.root.ChildrenNodes).To(HaveLen(1)) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes).To(HaveLen(2)) + Expect(tree.root.ChildrenNodes[0].Self).To(Equal(uint64(0))) + Expect(tree.root.ChildrenNodes[0].Total).To(Equal(uint64(3))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[0].Self).To(Equal(uint64(1))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[1].Self).To(Equal(uint64(2))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[0].Total).To(Equal(uint64(1))) + Expect(tree.root.ChildrenNodes[0].ChildrenNodes[1].Total).To(Equal(uint64(2))) + Expect(tree.String()).To(Equal("a;bb 1\na;bc 2\n")) + }) + }) + Context("Merge", func() { Context("similar trees", func() { treeA := New() diff --git a/webapp/javascript/components/AdhocComparison.tsx b/webapp/javascript/components/AdhocComparison.tsx index 1243cc3139..d603152a12 100644 --- a/webapp/javascript/components/AdhocComparison.tsx +++ b/webapp/javascript/components/AdhocComparison.tsx @@ -152,11 +152,11 @@ const mapStateToProps = (state) => ({ ...state.root, leftFile: state.root.adhocComparison.left.file, leftFlamebearer: state.root.adhocComparison.left.flamebearer, - leftProfile: state.root.adhocComparison.left.profile, + leftProfile: state.root.adhocShared.left.profile, isLeftProfileLoading: state.root.adhocComparison.left.isProfileLoading, rightFile: state.root.adhocComparison.right.file, rightFlamebearer: state.root.adhocComparison.right.flamebearer, - rightProfile: state.root.adhocComparison.right.profile, + rightProfile: state.root.adhocShared.right.profile, isRightProfileLoading: state.root.adhocComparison.right.isProfileLoading, }); diff --git a/webapp/javascript/components/AdhocComparisonDiff.tsx b/webapp/javascript/components/AdhocComparisonDiff.tsx new file mode 100644 index 0000000000..dc7c215bf7 --- /dev/null +++ b/webapp/javascript/components/AdhocComparisonDiff.tsx @@ -0,0 +1,123 @@ +import React, { useEffect } from 'react'; +import { connect } from 'react-redux'; +import 'react-dom'; + +import { bindActionCreators } from 'redux'; +import Box from '@ui/Box'; +import { Tab, Tabs, TabList, TabPanel } from 'react-tabs'; +import Spinner from 'react-svg-spinner'; +import classNames from 'classnames'; +import FileList from './FileList'; +import FlameGraphRenderer from './FlameGraph'; +import Footer from './Footer'; +import { + fetchAdhocProfiles, + fetchAdhocProfileDiff, + setAdhocLeftProfile, + setAdhocRightProfile, +} from '../redux/actions'; +import styles from './ComparisonApp.module.css'; +import 'react-tabs/style/react-tabs.css'; +import adhocStyles from './Adhoc.module.scss'; + +function AdhocComparisonDiff(props) { + const { actions, isProfileLoading, flamebearer, leftProfile, rightProfile } = + props; + const { setAdhocLeftProfile, setAdhocRightProfile } = actions; + + useEffect(() => { + actions.fetchAdhocProfiles(); + return actions.abortFetchAdhocProfiles; + }, []); + + useEffect(() => { + if (leftProfile && rightProfile) { + actions.fetchAdhocProfileDiff(leftProfile, rightProfile); + } + return actions.abortFetchAdhocProfileDiff; + }, [leftProfile, rightProfile]); + + return ( +
+
+
+ + + + Pyroscope data + Upload + + + + + + + + + + + Pyroscope data + Upload + + + + + + + +
+ + {isProfileLoading && ( +
+ +
+ )} + {!isProfileLoading && ( + + )} + +
+
+ ); +} + +const mapStateToProps = (state) => ({ + ...state.root, + flamebearer: state.root.adhocComparisonDiff.flamebearer, + isProfileLoading: state.root.adhocComparisonDiff.isProfileLoading, + leftProfile: state.root.adhocShared.left.profile, + rightProfile: state.root.adhocShared.right.profile, +}); + +const mapDispatchToProps = (dispatch) => ({ + actions: bindActionCreators( + { + fetchAdhocProfiles, + fetchAdhocProfileDiff, + setAdhocLeftProfile, + setAdhocRightProfile, + }, + dispatch + ), +}); + +export default connect( + mapStateToProps, + mapDispatchToProps +)(AdhocComparisonDiff); diff --git a/webapp/javascript/components/Sidebar.tsx b/webapp/javascript/components/Sidebar.tsx index de4141cd6d..8f11ffaedb 100644 --- a/webapp/javascript/components/Sidebar.tsx +++ b/webapp/javascript/components/Sidebar.tsx @@ -99,15 +99,14 @@ export default function Sidebar2(props: SidebarProps) { Comparison View - {/* } > Diff View + - */} ); diff --git a/webapp/javascript/index.jsx b/webapp/javascript/index.jsx index 44d28af953..d83ecc8392 100644 --- a/webapp/javascript/index.jsx +++ b/webapp/javascript/index.jsx @@ -14,6 +14,7 @@ import ComparisonDiffApp from './components/ComparisonDiffApp'; import Sidebar from './components/Sidebar'; import AdhocSingle from './components/AdhocSingle'; import AdhocComparison from './components/AdhocComparison'; +import AdhocComparisonDiff from './components/AdhocComparisonDiff'; import ServerNotifications from './components/ServerNotifications'; import history from './util/history'; @@ -54,6 +55,11 @@ ReactDOM.render( )} + {isExperimentalAdhocUIEnabled && ( + + + + )} diff --git a/webapp/javascript/redux/actionTypes.js b/webapp/javascript/redux/actionTypes.js index 2ee112f523..d5711cdf1b 100644 --- a/webapp/javascript/redux/actionTypes.js +++ b/webapp/javascript/redux/actionTypes.js @@ -56,3 +56,7 @@ export const RECEIVE_ADHOC_LEFT_PROFILE = 'RECEIVE_ADHOC_LEFT_PROFILE'; export const RECEIVE_ADHOC_RIGHT_PROFILE = 'RECEIVE_ADHOC_RIGHT_PROFILE'; export const CANCEL_ADHOC_LEFT_PROFILE = 'CANCEL_ADHOC_LEFT_PROFILE'; export const CANCEL_ADHOC_RIGHT_PROFILE = 'RECEIVE_ADHOC_RIGHT_PROFILE'; + +export const REQUEST_ADHOC_PROFILE_DIFF = 'REQUEST_ADHOC_PROFILE_DIFF'; +export const RECEIVE_ADHOC_PROFILE_DIFF = 'RECEIVE_ADHOC_PROFILE_DIFF'; +export const CANCEL_ADHOC_PROFILE_DIFF = 'CANCEL_ADHOC_PROFILE_DIFF'; diff --git a/webapp/javascript/redux/actions.js b/webapp/javascript/redux/actions.js index dfd736d563..0732835a07 100644 --- a/webapp/javascript/redux/actions.js +++ b/webapp/javascript/redux/actions.js @@ -46,6 +46,9 @@ import { RECEIVE_ADHOC_RIGHT_PROFILE, CANCEL_ADHOC_LEFT_PROFILE, CANCEL_ADHOC_RIGHT_PROFILE, + REQUEST_ADHOC_PROFILE_DIFF, + RECEIVE_ADHOC_PROFILE_DIFF, + CANCEL_ADHOC_PROFILE_DIFF, } from './actionTypes'; import { isAbortError } from '../util/abort'; import { addNotification } from './reducers/notifications'; @@ -187,10 +190,7 @@ export const setAdhocRightFile = (file, flamebearer) => ({ payload: { file, flamebearer }, }); -export const requestAdhocProfiles = () => ({ - type: REQUEST_ADHOC_PROFILES, - payload: {}, -}); +export const requestAdhocProfiles = () => ({ type: REQUEST_ADHOC_PROFILES }); export const receiveAdhocProfiles = (profiles) => ({ type: RECEIVE_ADHOC_PROFILES, @@ -204,10 +204,7 @@ export const setAdhocProfile = (profile) => ({ payload: { profile }, }); -export const requestAdhocProfile = (profile) => ({ - type: REQUEST_ADHOC_PROFILE, - payload: { profile }, -}); +export const requestAdhocProfile = () => ({ type: REQUEST_ADHOC_PROFILE }); export const receiveAdhocProfile = (flamebearer) => ({ type: RECEIVE_ADHOC_PROFILE, @@ -221,9 +218,8 @@ export const setAdhocLeftProfile = (profile) => ({ payload: { profile }, }); -export const requestAdhocLeftProfile = (profile) => ({ +export const requestAdhocLeftProfile = () => ({ type: REQUEST_ADHOC_LEFT_PROFILE, - payload: { profile }, }); export const receiveAdhocLeftProfile = (flamebearer) => ({ @@ -240,9 +236,8 @@ export const setAdhocRightProfile = (profile) => ({ payload: { profile }, }); -export const requestAdhocRightProfile = (profile) => ({ +export const requestAdhocRightProfile = () => ({ type: REQUEST_ADHOC_RIGHT_PROFILE, - payload: { profile }, }); export const receiveAdhocRightProfile = (flamebearer) => ({ @@ -254,6 +249,19 @@ export const cancelAdhocRightProfile = () => ({ type: CANCEL_ADHOC_RIGHT_PROFILE, }); +export const requestAdhocProfileDiff = () => ({ + type: REQUEST_ADHOC_PROFILE_DIFF, +}); + +export const receiveAdhocProfileDiff = (flamebearer) => ({ + type: RECEIVE_ADHOC_PROFILE_DIFF, + payload: { flamebearer }, +}); + +export const cancelAdhocProfileDiff = () => ({ + type: CANCEL_ADHOC_PROFILE_DIFF, +}); + // ResponseNotOkError refers to when request is not ok // ie when status code is not in the 2xx range class ResponseNotOkError extends Error { @@ -522,7 +530,7 @@ export function fetchAdhocProfile(profile) { } adhocProfileController = new AbortController(); - dispatch(requestAdhocProfile(profile)); + dispatch(requestAdhocProfile()); return fetch(`./api/adhoc/v1/profile/${profile}`, { signal: adhocProfileController.signal, }) @@ -549,7 +557,7 @@ export function fetchAdhocLeftProfile(profile) { } adhocLeftProfileController = new AbortController(); - dispatch(requestAdhocLeftProfile(profile)); + dispatch(requestAdhocLeftProfile()); return fetch(`./api/adhoc/v1/profile/${profile}`, { signal: adhocLeftProfileController.signal, }) @@ -576,7 +584,7 @@ export function fetchAdhocRightProfile(profile) { } adhocRightProfileController = new AbortController(); - dispatch(requestAdhocRightProfile(profile)); + dispatch(requestAdhocRightProfile()); return fetch(`./api/adhoc/v1/profile/${profile}`, { signal: adhocRightProfileController.signal, }) @@ -594,3 +602,30 @@ export function abortFetchAdhocRightProfile() { } }; } + +let adhocProfileDiffController; +export function fetchAdhocProfileDiff(left, right) { + return (dispatch) => { + if (adhocProfileDiffController) { + adhocProfileDiffController.abort(); + } + + adhocProfileDiffController = new AbortController(); + dispatch(requestAdhocProfileDiff()); + return fetch(`./api/adhoc/v1/diff/${left}/${right}`, { + signal: adhocProfileDiffController.signal, + }) + .then((response) => handleResponse(dispatch, response)) + .then((data) => dispatch(receiveAdhocProfileDiff(data))) + .catch((e) => handleError(dispatch, e)) + .then(() => dispatch(cancelAdhocProfileDiff())) + .finally(); + }; +} +export function abortFetchAdhocProfileDiff() { + return () => { + if (adhocProfileDiffController) { + adhocProfileDiffController.abort(); + } + }; +} diff --git a/webapp/javascript/redux/reducers/filters.ts b/webapp/javascript/redux/reducers/filters.ts index b5bf18e841..1228b41d62 100644 --- a/webapp/javascript/redux/reducers/filters.ts +++ b/webapp/javascript/redux/reducers/filters.ts @@ -46,6 +46,9 @@ import { REQUEST_ADHOC_RIGHT_PROFILE, RECEIVE_ADHOC_RIGHT_PROFILE, CANCEL_ADHOC_RIGHT_PROFILE, + REQUEST_ADHOC_PROFILE_DIFF, + RECEIVE_ADHOC_PROFILE_DIFF, + CANCEL_ADHOC_PROFILE_DIFF, } from '../actionTypes'; import { deltaDiffWrapper } from '../../util/flamebearer'; @@ -84,20 +87,30 @@ const initialState = { flamebearer: null, isProfileLoading: false, }, + adhocShared: { + left: { + profile: null, + }, + right: { + profile: null, + }, + }, adhocComparison: { left: { file: null, - profile: null, flamebearer: null, isProfileLoading: false, }, right: { file: null, - profile: null, flamebearer: null, isProfileLoading: false, }, }, + adhocComparisonDiff: { + flamebearer: null, + isProfileLoading: false, + }, isJSONLoading: false, maxNodes: 1024, tags: [], @@ -434,11 +447,17 @@ export default function (state = initialState, action) { } = action); return { ...state, + adhocShared: { + ...state.adhocShared, + left: { + ...state.adhocShared.left, + profile: null, + }, + }, adhocComparison: { ...state.adhocComparison, left: { ...state.adhocComparison.left, - profile: null, file, flamebearer: flamebearer ? decodeFlamebearer(flamebearer) : null, }, @@ -450,11 +469,17 @@ export default function (state = initialState, action) { } = action); return { ...state, + adhocShared: { + ...state.adhocShared, + right: { + ...state.adhocShared.right, + profile: null, + }, + }, adhocComparison: { ...state.adhocComparison, right: { ...state.adhocComparison.right, - profile: null, file, flamebearer: flamebearer ? decodeFlamebearer(flamebearer) : null, }, @@ -525,12 +550,18 @@ export default function (state = initialState, action) { } = action); return { ...state, + adhocShared: { + ...state.adhocShared, + left: { + ...state.adhocShared.left, + profile, + }, + }, adhocComparison: { ...state.adhocComparison, left: { ...state.adhocComparison.left, file: null, - profile, }, }, }; @@ -577,12 +608,18 @@ export default function (state = initialState, action) { } = action); return { ...state, + adhocShared: { + ...state.adhocShared, + right: { + ...state.adhocShared.right, + profile, + }, + }, adhocComparison: { ...state.adhocComparison, right: { ...state.adhocComparison.right, file: null, - profile, }, }, }; @@ -623,6 +660,34 @@ export default function (state = initialState, action) { }, }, }; + case REQUEST_ADHOC_PROFILE_DIFF: + return { + ...state, + adhocComparisonDiff: { + ...state.adhocComparisonDiff, + isProfileLoading: true, + }, + }; + case RECEIVE_ADHOC_PROFILE_DIFF: + ({ + payload: { flamebearer }, + } = action); + return { + ...state, + adhocComparisonDiff: { + ...state.adhocComparisonDiff, + flamebearer: decodeFlamebearer(flamebearer), + isProfileLoading: false, + }, + }; + case CANCEL_ADHOC_PROFILE_DIFF: + return { + ...state, + adhocComparisonDiff: { + ...state.adhocComparisonDiff, + isProfileLoading: false, + }, + }; default: return state; }