Skip to content

Commit

Permalink
Remove handling for 'CHANGED' discovery event
Browse files Browse the repository at this point in the history
Cryostat backend never emits the 'CHANGED' event type anymore, instead emitting a LOST-FOUND sequence in any scenario where a target modification is detected
  • Loading branch information
andrewazores committed May 31, 2021
1 parent 18fb495 commit 756b8f1
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 21 deletions.
12 changes: 6 additions & 6 deletions src/app/Events/EventTemplates.tsx
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
/*
* Copyright The Cryostat Authors
*
*
* The Universal Permissive License (UPL), Version 1.0
*
*
* Subject to the condition set forth below, permission is hereby granted to any
* person obtaining a copy of this software, associated documentation and/or data
* (collectively the "Software"), free of charge and under any and all copyright
* rights in the Software, and any and all patent rights owned or freely
* licensable by each licensor hereunder covering either (i) the unmodified
* Software as contributed to or provided by such licensor, or (ii) the Larger
* Works (as defined below), to deal in both
*
*
* (a) the Software, and
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
* one is included with the Software (each a "Larger Work" to which the Software
* is contributed by such licensors),
*
*
* without restriction, including without limitation the rights to copy, create
* derivative works of, display, perform, and distribute the Software and make,
* use, sell, offer for sale, import, export, have made, and have sold the
* Software and the Larger Work(s), and to sublicense the foregoing rights on
* either these or other terms.
*
*
* This license is subject to the following condition:
* The above copyright notice and either this complete permission notice or at
* a minimum a reference to the UPL must be included in all copies or
* substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
Expand Down
22 changes: 7 additions & 15 deletions src/app/TargetSelect/TargetSelect.tsx
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
/*
* Copyright The Cryostat Authors
*
*
* The Universal Permissive License (UPL), Version 1.0
*
*
* Subject to the condition set forth below, permission is hereby granted to any
* person obtaining a copy of this software, associated documentation and/or data
* (collectively the "Software"), free of charge and under any and all copyright
* rights in the Software, and any and all patent rights owned or freely
* licensable by each licensor hereunder covering either (i) the unmodified
* Software as contributed to or provided by such licensor, or (ii) the Larger
* Works (as defined below), to deal in both
*
*
* (a) the Software, and
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
* one is included with the Software (each a "Larger Work" to which the Software
* is contributed by such licensors),
*
*
* without restriction, including without limitation the rights to copy, create
* derivative works of, display, perform, and distribute the Software and make,
* use, sell, offer for sale, import, export, have made, and have sold the
* Software and the Larger Work(s), and to sublicense the foregoing rights on
* either these or other terms.
*
*
* This license is subject to the following condition:
* The above copyright notice and either this complete permission notice or at
* a minimum a reference to the UPL must be included in all copies or
* substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
Expand Down Expand Up @@ -94,14 +94,6 @@ export const TargetSelect: React.FunctionComponent<TargetSelectProps> = (props)
selectNone();
}
break;
case 'CHANGED':
setTargets(old => {
const filtered = _.filter(old, t => t.connectUrl !== evt.serviceRef.connectUrl);
const updated =_.unionBy(filtered, [evt.serviceRef], t => t.connectUrl);
onSelect(undefined, _.find(updated, t => t.connectUrl === selected.connectUrl), false);
return updated;
});
break;
default:
notifications.danger(`Bad ${NOTIFICATION_CATEGORY} message received`, `Unknown event type ${evt.kind}`);
break;
Expand Down Expand Up @@ -198,6 +190,6 @@ export const TargetSelect: React.FunctionComponent<TargetSelectProps> = (props)
}

interface TargetDiscoveryEvent {
kind: 'LOST' | 'FOUND' | 'CHANGED';
kind: 'LOST' | 'FOUND';
serviceRef: Target;
}

0 comments on commit 756b8f1

Please sign in to comment.