Skip to content

Commit

Permalink
Remove feature unavailable and mock code from cluster settings
Browse files Browse the repository at this point in the history
  • Loading branch information
@TheRealJon
TheRealJon committed Jan 30, 2019
1 parent ce7d427 commit 4f11a2e
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 55 deletions.
71 changes: 20 additions & 51 deletions frontend/public/components/cluster-settings/cluster-settings.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,12 @@ enum ClusterUpdateStatus {
Updating = 'Updating',
Failing = 'Failing',
ErrorRetrieving = 'Error Retrieving',
FeatureUnavailable = '-',
}

// TODO - REMOVE MOCK CODE
const MOCK_CLUSTER_UPDATE = localStorage.getItem('MOCK_CLUSTER_UPDATE');
// END MOCK CODE

const clusterAutoscalerReference = referenceForModel(ClusterAutoscalerModel);
const clusterVersionReference = referenceForModel(ClusterVersionModel);

export const getAvailableClusterUpdates = (cv) => {
// TODO - REMOVE MOCK CODE
if (MOCK_CLUSTER_UPDATE) {
return [{ version: '4.0.0', payload: 'openshift/release:v4.0.0' }];
}
// END MOCK CODE

return _.get(cv, 'status.availableUpdates');
};

Expand All @@ -51,33 +40,24 @@ const launchUpdateModal = (cv) => {
};

const getClusterUpdateStatus = (cv: K8sResourceKind): ClusterUpdateStatus => {
// TODO Remove this line and uncomment the rest of this function once update feature is available
return ClusterUpdateStatus.FeatureUnavailable;

// TODO - REMOVE MOCK CODE
// if (MOCK_CLUSTER_UPDATE) {
// return ClusterUpdateStatus.UpdatesAvailable;
// }
// // END MOCK CODE

// const conditions = _.get(cv, 'status.conditions', []);
// const isFailingCondition = _.find(conditions, { type: 'Failing', status: 'True' });
// if (isFailingCondition) {
// return ClusterUpdateStatus.Failing;
// }

// const retrievedUpdatesFailedCondition = _.find(conditions, { type: 'RetrievedUpdates', status: 'False' });
// if (retrievedUpdatesFailedCondition) {
// return ClusterUpdateStatus.ErrorRetrieving;
// }

// const isProgressingCondition = _.find(conditions, { type: 'Progressing', status: 'True' });
// if (isProgressingCondition) {
// return ClusterUpdateStatus.Updating;
// }

// const updates = _.get(cv, 'status.availableUpdates');
// return _.isEmpty(updates) ? ClusterUpdateStatus.UpToDate : ClusterUpdateStatus.UpdatesAvailable;
const conditions = _.get(cv, 'status.conditions', []);
const isFailingCondition = _.find(conditions, { type: 'Failing', status: 'True' });
if (isFailingCondition) {
return ClusterUpdateStatus.Failing;
}

const retrievedUpdatesFailedCondition = _.find(conditions, { type: 'RetrievedUpdates', status: 'False' });
if (retrievedUpdatesFailedCondition) {
return ClusterUpdateStatus.ErrorRetrieving;
}

const isProgressingCondition = _.find(conditions, { type: 'Progressing', status: 'True' });
if (isProgressingCondition) {
return ClusterUpdateStatus.Updating;
}

const updates = _.get(cv, 'status.availableUpdates');
return _.isEmpty(updates) ? ClusterUpdateStatus.UpToDate : ClusterUpdateStatus.UpdatesAvailable;
};

const getIconClass = (status: ClusterUpdateStatus) => {
Expand Down Expand Up @@ -111,11 +91,6 @@ const UpdatesAvailableAlert = ({cv}) => <div className="alert alert-info">
</Button>
</div>;

const FeatureUnavailableAlert = () => <div className="alert alert-info">
<i className="pficon pficon-info" aria-hidden="true"></i>
Cluster updates are not supported in beta 1.
</div>;

const UpdateStatus: React.SFC<UpdateStatusProps> = ({cv}) => {
const status = getClusterUpdateStatus(cv);
const iconClass = getIconClass(status);
Expand Down Expand Up @@ -144,19 +119,13 @@ const CurrentVersion: React.SFC<CurrentVersionProps> = ({cv}) => {
const ClusterVersionDetailsTable: React.SFC<ClusterVersionDetailsTableProps> = ({obj: cv, autoscalers}) => {
const conditions = _.get(cv, 'status.conditions', []);
const status = getClusterUpdateStatus(cv);

// TODO - REMOVE MOCK CODE
const disableErrors = MOCK_CLUSTER_UPDATE || status === ClusterUpdateStatus.FeatureUnavailable;
const retrievedUpdatesFailedCondition = !disableErrors && _.find(conditions, { type: 'RetrievedUpdates', status: 'False' });
const isFailingCondition = !disableErrors && _.find(conditions, { type: 'Failing', status: 'True' });
// END MOCK CODE

const retrievedUpdatesFailedCondition = _.find(conditions, { type: 'RetrievedUpdates', status: 'False' });
const isFailingCondition = _.find(conditions, { type: 'Failing', status: 'True' });

return <div className="co-m-pane__body">
<div className="co-m-pane__body-group">
{ status === ClusterUpdateStatus.Updating && <UpdateInProgressAlert /> }
{ status === ClusterUpdateStatus.UpdatesAvailable && <UpdatesAvailableAlert cv={cv} /> }
{ status === ClusterUpdateStatus.FeatureUnavailable && <FeatureUnavailableAlert /> }
{ isFailingCondition && <FailedConditionAlert message="Update is failing." condition={isFailingCondition} /> }
{ retrievedUpdatesFailedCondition && <FailedConditionAlert message="Could not retrieve updates." condition={retrievedUpdatesFailedCondition} /> }
<div className="co-detail-table">
Expand Down
5 changes: 1 addition & 4 deletions frontend/public/features.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,7 @@ const detectClusterVersion = dispatch => coFetchJSON(clusterVersionPath)
}

const availableUpdates = _.get(clusterVersion, 'status.availableUpdates');

// TODO - REMOVE MOCK CODE
setFlag(dispatch, FLAGS.CLUSTER_UPDATES_AVAILABLE, localStorage.getItem('MOCK_CLUSTER_UPDATE') || !_.isEmpty(availableUpdates));
// END MOCK CODE
setFlag(dispatch, FLAGS.CLUSTER_UPDATES_AVAILABLE, !_.isEmpty(availableUpdates));
},
err => {
if (_.includes([403, 404], _.get(err, 'response.status'))) {
Expand Down

0 comments on commit 4f11a2e

Please sign in to comment.