Independent Mode Dashboard #3907

bipuladh · 2020-01-09T12:17:09Z

Added blocker extension point to block out the CEPH dashboard if the independent mode is present.

frontend/packages/console-plugin-sdk/src/registry.ts

frontend/packages/console-plugin-sdk/src/typings/features.ts

frontend/public/actions/features.ts

frontend/packages/ceph-storage-plugin/src/plugin.ts

frontend/packages/console-plugin-sdk/src/registry.ts

frontend/public/actions/features.ts

frontend/packages/console-plugin-sdk/src/registry.ts

frontend/packages/ceph-storage-plugin/src/plugin.ts

frontend/packages/console-plugin-sdk/src/registry.ts

frontend/packages/ocs-independent-plugin/src/components/dashboard-page/details-card/card.tsx

frontend/packages/ocs-independent-plugin/src/plugin.ts

frontend/public/actions/features.ts

frontend/packages/metal3-plugin/src/feature.ts

vojtechszocs · 2020-01-16T16:12:33Z

frontend/packages/ceph-storage-plugin/src/constants/index.ts

@@ -9,3 +9,4 @@ export const PODS = 'Pods';
 export const BY_USED = 'By Used Capacity';
 export const BY_REQUESTED = 'By Requested Capacity';
 export const OCS_OPERATOR = 'ocs-operator';
+export const INDEPENDENT_FLAG = 'INDEPENDENT_FLAG';


Let's try to keep a clear exported API boundary between Console plugins.

in ocs-independent-plugin/src/plugin.ts

export const INDEPENDENT_FLAG = 'INDEPENDENT_FLAG';

add ocs-independent-plugin/src/index.ts

export { INDEPENDENT_FLAG } from './plugin';

in ocs-independent-plugin/package.json

.. "private": true, "main": "src/index.ts", "dependencies": .. ..

and finally in ceph-storage-plugin/src/plugin.ts

import { INDEPENDENT_FLAG } from '@console/ocs-independent-plugin';

I did this because. ocs is dependent on ceph already. If I export this from ocs then wouldn't this cause a circular dependency issue?

What I meant is the feature flag constant should live close to the Console plugin which "owns" it.

In this case, it would be ocs-independent-plugin which declares it as

{ type: 'FeatureFlag/Model', properties: { model: OCSServiceModel, flag: INDEPENDENT_FLAG, }, },

We should avoid duplicating the same constant value across different packages.

Also, I'd suggest to modify the flag's value to CEPH_INDEPENDENT or OCS_INDEPENDENT to reflect relationship with OCS.

ocs is dependent on ceph already

Does it make sense to merge OCS/independent plugin code into existing Ceph plugin? These two plugins seem to be closely related.

If we want to keep them separated and avoid dependency cycle, we should move the common code into console-shared package, e.g. packages/console-shared/src/constants/flags.ts declaring shared flags.

frontend/packages/ceph-storage-plugin/src/plugin.ts

vojtechszocs · 2020-01-16T16:15:58Z

frontend/packages/console-plugin-sdk/src/registry.ts

    const requiredFlags = e.properties.required ? _.castArray(e.properties.required) : [];
-    return _.every(requiredFlags, (f) => flags[f]);
+    return (
+      _.every(requiredFlags, (f) => flags[f]) && _.every(disallowedFlags, (f) => flags[f] === false)


Suggested change

_.every(requiredFlags, (f) => flags[f]) && _.every(disallowedFlags, (f) => flags[f] === false)

_.every(requiredFlags, (f) => flags[f] === true) && _.every(disallowedFlags, (f) => flags[f] === false)

frontend/packages/console-plugin-sdk/src/typings/features.ts

frontend/packages/metal3-plugin/src/constants/bare-metal-host.ts

frontend/packages/metal3-plugin/src/plugin.tsx

vojtechszocs · 2020-01-16T16:32:07Z

frontend/packages/ocs-independent-plugin/src/plugin.ts

+import { GridPosition } from '@console/shared/src/components/dashboard/DashboardGrid';
+import { OCSServiceModel } from '@console/ceph-storage-plugin/src/models';
+import { detectIndependentMode } from './feature';
+import { INDEPENDENT_FLAG } from './consts';


I'd suggest keeping flag name constants inside the plugin entry module (this file).

I'd suggest keeping flag name constants inside the plugin entry module (this file).

Update: if the flag is managed via detector function, move it to corresponding features module. If it's shared between multiple packages, move it to console-shared constants.

frontend/public/actions/features.ts

@@ -294,7 +281,6 @@ export const detectFeatures = () => (dispatch: Dispatch) =>
  [
    detectOpenShift,
    // TODO(vojtech): move this flag definition to metal3-plugin via ActionFeatureFlag extension
-    detectBaremetalPlatform,


vojtechszocs · 2020-01-16T16:50:54Z

frontend/public/reducers/features.ts

+    case ActionType.AddFlag:
+      // eslint-disable-next-line no-console
+      console.log(`${action.payload.flag} is added`);
+      return state.set(action.payload.flag, false);


The initial value should be set to undefined (feature detection in progress).

false means the feature detection is complete and feature is not available.

But I don't think we really need another action, like ActionType.AddFlag.

The simplest way to handle flags outside the base FLAGS enum is to remove unknown flag check for ActionType.SetFlag:

case ActionType.SetFlag: return state.set(action.payload.flag, action.payload.value);

But I think the best solution is to iterate over all extensions which deal with flags and build an array of allowed flag names, and check against that.

vojtechszocs · 2020-01-16T19:54:52Z

@bipuladh For now, I'd suggest not doing any Metal3 plugin refactoring to keep this PR focused on the OCS/Independent plugin.

Also see #3987 which makes Console plugin infra changes also needed by this PR.

vojtechszocs · 2020-01-23T16:47:14Z

/retest

openshift-bot · 2020-01-23T17:08:04Z

/retest

Please review the full test history for this PR and help us cut down flakes.

bipuladh · 2020-01-23T17:09:24Z

/retest

rawagner · 2020-01-23T17:14:40Z

/hold

build is failing due to incorrect import

ERROR in ./packages/ceph-storage-plugin/src/components/independent-dashboard-page/utilization-card/card.tsx
Module not found: Error: Can't resolve '@console/internal/components/dashboard/dashboards-page/overview-dashboard/utilization-card' in '/go/src/github.com/openshift/console/frontend/packages/ceph-storage-plugin/src/components/independent-dashboard-page/utilization-card'

vojtechszocs · 2020-01-23T17:49:48Z

Fixed rebase conflict in packages/ceph-storage-plugin/src/plugin.ts and the import error.

/hold cancel

rawagner · 2020-01-23T18:05:10Z

/lgtm

vojtechszocs · 2020-01-23T19:16:58Z

/retest

rawagner · 2020-01-23T19:20:33Z

/lgtm

openshift-ci-robot · 2020-01-23T19:22:00Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bipuladh, rawagner, vojtechszocs

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~frontend/OWNERS~~ [rawagner,vojtechszocs]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

vojtechszocs · 2020-01-23T19:50:59Z

/retest

openshift-bot · 2020-01-23T21:52:52Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-01-23T23:50:48Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-01-24T03:44:25Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-01-24T06:20:41Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 9, 2020

openshift-ci-robot requested review from cloudbehl and rawagner January 9, 2020 12:17

openshift-ci-robot added component/ceph Related to ceph-storage-plugin component/core Related to console core functionality component/dashboard Related to dashboard component/sdk Related to console-plugin-sdk labels Jan 9, 2020

bipuladh commented Jan 9, 2020

View reviewed changes

frontend/packages/console-plugin-sdk/src/registry.ts Outdated Show resolved Hide resolved

bipuladh commented Jan 9, 2020

View reviewed changes

frontend/packages/console-plugin-sdk/src/typings/features.ts Outdated Show resolved Hide resolved

bipuladh commented Jan 9, 2020

View reviewed changes

frontend/public/actions/features.ts Outdated Show resolved Hide resolved

rawagner reviewed Jan 9, 2020

View reviewed changes

frontend/packages/ceph-storage-plugin/src/plugin.ts Outdated Show resolved Hide resolved

frontend/packages/console-plugin-sdk/src/registry.ts Outdated Show resolved Hide resolved

frontend/public/actions/features.ts Outdated Show resolved Hide resolved

openshift-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 13, 2020

vojtechszocs suggested changes Jan 13, 2020

View reviewed changes

vojtechszocs mentioned this pull request Jan 13, 2020

Add ActionFeatureFlag extension #3936

Merged

bipuladh force-pushed the independent-dashboard branch from 0fdfb94 to c0847fe Compare January 15, 2020 17:22

openshift-ci-robot added component/metal3 Related to metal3-plugin component/shared Related to console-shared labels Jan 15, 2020

bipuladh force-pushed the independent-dashboard branch from 7f3d8c5 to 8c3d0c9 Compare January 16, 2020 14:10

bipuladh commented Jan 16, 2020

View reviewed changes

frontend/packages/metal3-plugin/src/feature.ts Outdated Show resolved Hide resolved

vojtechszocs suggested changes Jan 16, 2020

View reviewed changes

bipuladh force-pushed the independent-dashboard branch from 8c3d0c9 to 42ac2f1 Compare January 16, 2020 16:59

bipuladh force-pushed the independent-dashboard branch from 42ac2f1 to c45c40b Compare January 20, 2020 16:57

openshift-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. component/olm Related to OLM and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jan 20, 2020

bipuladh force-pushed the independent-dashboard branch from c45c40b to fd38b74 Compare January 20, 2020 18:14

bipuladh requested a review from vojtechszocs January 20, 2020 18:14

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 23, 2020

bipuladh changed the title ~~[WIP] Independent Mode Dashboard~~ Independent Mode Dashboard Jan 23, 2020

openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 23, 2020

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 23, 2020

vojtechszocs force-pushed the independent-dashboard branch from 501aca1 to 7cb77df Compare January 23, 2020 17:47

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jan 23, 2020

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 23, 2020

openshift-ci-robot assigned rawagner Jan 23, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 23, 2020

Adds a new dashboard for OCS Independent Mode

8384bb4

vojtechszocs force-pushed the independent-dashboard branch from 7cb77df to 8384bb4 Compare January 23, 2020 18:33

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jan 23, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 23, 2020

openshift-merge-robot merged commit 2e2a7b1 into openshift:master Jan 24, 2020

vojtechszocs mentioned this pull request Jan 24, 2020

HorizontalNavTab Extension #3917

Merged

spadgett added this to the v4.4 milestone Jan 27, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Independent Mode Dashboard #3907

Independent Mode Dashboard #3907

bipuladh commented Jan 9, 2020

vojtechszocs Jan 16, 2020

bipuladh Jan 17, 2020

vojtechszocs Jan 21, 2020

vojtechszocs Jan 21, 2020

vojtechszocs Jan 16, 2020

vojtechszocs Jan 16, 2020

vojtechszocs Jan 21, 2020

This comment was marked as resolved.

vojtechszocs Jan 16, 2020

vojtechszocs commented Jan 16, 2020

vojtechszocs commented Jan 23, 2020

openshift-bot commented Jan 23, 2020

bipuladh commented Jan 23, 2020

rawagner commented Jan 23, 2020

vojtechszocs commented Jan 23, 2020

rawagner commented Jan 23, 2020

vojtechszocs commented Jan 23, 2020

rawagner commented Jan 23, 2020

openshift-ci-robot commented Jan 23, 2020

vojtechszocs commented Jan 23, 2020

openshift-bot commented Jan 23, 2020

openshift-bot commented Jan 23, 2020

openshift-bot commented Jan 24, 2020

openshift-bot commented Jan 24, 2020

	_.every(requiredFlags, (f) => flags[f]) && _.every(disallowedFlags, (f) => flags[f] === false)
	_.every(requiredFlags, (f) => flags[f] === true) && _.every(disallowedFlags, (f) => flags[f] === false)

Independent Mode Dashboard #3907

Independent Mode Dashboard #3907

Conversation

bipuladh commented Jan 9, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment was marked as resolved.

Choose a reason for hiding this comment

vojtechszocs commented Jan 16, 2020

vojtechszocs commented Jan 23, 2020

openshift-bot commented Jan 23, 2020

bipuladh commented Jan 23, 2020

rawagner commented Jan 23, 2020

vojtechszocs commented Jan 23, 2020

rawagner commented Jan 23, 2020

vojtechszocs commented Jan 23, 2020

rawagner commented Jan 23, 2020

openshift-ci-robot commented Jan 23, 2020

vojtechszocs commented Jan 23, 2020

openshift-bot commented Jan 23, 2020

openshift-bot commented Jan 23, 2020

openshift-bot commented Jan 24, 2020

openshift-bot commented Jan 24, 2020