Skip to content

Firehose: honor optional prop for watches on individual resources #1711

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.

Sign up for GitHub

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

Merged
openshift-merge-robot merged 2 commits into from
Jun 14, 2019
Merged

Firehose: honor optional prop for watches on individual resources #1711

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98211bb
Firehose: introduce "ignoreIfMissing" resource property
mareklibra Jun 13, 2019
b1e3578
Firehose: fix the `optional` property for 404
mareklibra Jun 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions frontend/public/components/utils/firehose.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,12 @@ const processReduxId = ({k8s}, props) => {
}

if (!isList) {
Copy link
Member

@spadgett spadgett Jun 13, 2019

Choose a reason for hiding this comment

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

Ah, OK. I see now. We didn't have proper support for optional with individual resources, only lists.

const stuff = k8s.get(reduxID);
return stuff ? stuff.toJS() : {};
let stuff = k8s.get(reduxID);
if (stuff) {
stuff = stuff.toJS();
stuff.optional = props.optional;
}
return stuff || {};
Copy link
Member

@atiratree atiratree Jun 13, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

can we use the same approach which is used for lists?

const data = k8s.getIn([reduxID, 'data']);

 return {
    data: data && data.toJS(), 
    loadError: k8s.getIn([reduxID, 'loadError']),	
    loaded: k8s.getIn([reduxID, 'loaded']),
    optional: props.optional,
    ignoreIfMissing: props.ignoreIfMissing,
};

This way we can optionally swap the toJS with only immutables once they are needed in the future.

Copy link
Contributor Author

@mareklibra mareklibra Jun 13, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Actually the stuff is not the response received from API but already a wrapper around it, please see

console/frontend/public/reducers/k8s.ts

Line 135 in 98211bb

return state.mergeIn([id], {

Copy link
Member

@atiratree atiratree Jun 13, 2019

Choose a reason for hiding this comment

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

I know, but it will be easier to extend for adding a support of raw immutables

Copy link
Member

@atiratree atiratree Jun 13, 2019

Choose a reason for hiding this comment

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

meaning that toJS may not be used at all

Copy link
Contributor Author

@mareklibra mareklibra Jun 13, 2019

Choose a reason for hiding this comment

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

If this is needed, I propose to do it in a follow-up.
It would require refactoring of code around the reducer and this is unrelated to original need behind this PR.

}

const data = k8s.getIn([reduxID, 'data']);
Expand Down Expand Up @@ -208,6 +212,6 @@ Firehose.propTypes = {
selector: PropTypes.object,
fieldSelector: PropTypes.string,
isList: PropTypes.bool,
optional: PropTypes.bool,
optional: PropTypes.bool, // do not block children-rendering while resource is still being loaded; do not fail if resource is missing (404)
})).isRequired,
};