Fix Overview tab is present under Storage section #351

GowthamShanmugam · 2022-07-28T12:37:03Z

BZ: https://bugzilla.redhat.com/show_bug.cgi?id=2087078

Signed-off-by: Gowtham Shanmugasundaram gshanmug@redhat.com

GowthamShanmugam · 2022-07-28T12:42:23Z

/retest

GowthamShanmugam · 2022-07-28T12:45:17Z

With ODF-MCO console and ODF-console

GowthamShanmugam · 2022-07-29T06:50:37Z

packages/ocs/block-pool/BlockPoolListPage.tsx

-    blockPoolsError ||
-    compressionLoadError ||
-    rawCapLoadError;
+  const loaded = blockPoolsLoaded && (cephLoaded || scLoaded);


Fix for blockpool page shows not found, I am fixing this part of this because this is also related to hybrid console and this is also a blocker issue

GowthamShanmugam · 2022-07-29T06:50:59Z

packages/ocs/dashboards/object-service/details-card/details-card.tsx

@@ -103,8 +103,8 @@ export const ObjectServiceDetailsCard: React.FC<{}> = () => {
            title={t('System name')}
            isLoading={!systemResult || !dashboardLinkResult}
            error={
-              systemLoadError ||
-              dashboardLinkLoadError ||
+              systemLoadError?.message ||


same here object dashbaord goes blank

bipuladh · 2022-07-29T08:29:23Z

scripts/generatePluginPackage.js

@@ -0,0 +1,16 @@
+const fs = require('fs');


Make this ts file. Use ts-node.

bipuladh · 2022-08-01T15:02:11Z

console-extensions.json

@@ -15,14 +15,6 @@
      }
    }
  },
-  {


Lets move this file also inside of odf and make console-extension a generated file. Also add it to gitignore as well. Also make it part of install so that it doesn't cause users confusion. We also need to update the readme about adding extensions to packages instead of in the main console-extensions file.

bipuladh · 2022-08-03T06:11:29Z

scripts/generatePluginPackage.ts

@@ -0,0 +1,8 @@
+/* Copyright Contributors to the Open Cluster Management project */


Suggested change

/* Copyright Contributors to the Open Cluster Management project */

bipuladh · 2022-08-03T06:19:50Z

webpack.config.ts


 const config: webpack.Configuration & DevServerConfiguration = {
  mode: 'development',
  entry: {},
  output: {
-    path: path.resolve(__dirname, 'dist'),
+    path: path.resolve('./dist'),


Lets compile it to one place? Or is that going to be an issue to run the two plugins concurrently?

right now we dont have a concurrent use case, but ya with this solution concurrent is also possible. I am compiling inside corresponding plugin folder and it is considered as a root folder

bipuladh · 2022-08-03T06:20:45Z

package.json

+    "build": "NODE_ENV=production PLUGIN=odf I8N_NS=plugin__odf-console yarn build:plugin",
+    "build-mco": "NODE_ENV=production PLUGIN=mco I8N_NS=plugin__odf-multicluster-console yarn build:plugin",
+    "build-dev": "NODE_ENV=production PLUGIN=odf I8N_NS=plugin__odf-console yarn build:plugin",
+    "server:plugin": "cd plugins/${PLUGIN} && ts-node ../../scripts/generatePluginPackage.ts && yarn clean && NODE_ENV={MODE} I8N_NS=${I8N_NS} yarn ts-node ../../node_modules/.bin/webpack serve -c ../../webpack.config.ts",


Suggested change

"server:plugin": "cd plugins/${PLUGIN} && ts-node ../../scripts/generatePluginPackage.ts && yarn clean && NODE_ENV={MODE} I8N_NS=${I8N_NS} yarn ts-node ../../node_modules/.bin/webpack serve -c ../../webpack.config.ts",

"server:plugin": "cd plugins/${PLUGIN} && ts-node ../../scripts/generatePluginPackage.ts && yarn clean && NODE_ENV={MODE} I8N_NS=${I8N_NS} yarn ts-node ../../node_modules/.bin/webpack serve",

Webpack should recursively look for the config file? Is it not able to find it?

it is not finding, becuase not it is invoked from plugins directory, not root directory

I tried, but I am getting errors

Can't resolve './src' in '/home/gshanmug/Workspace/Openshift/odf-console/plugins/mco
Can't resolve './src' in '/home/gshanmug/Workspace/Openshift/odf-console/plugins/odf

SanjalKatiyar · 2022-08-03T07:08:22Z

plugins/mco/console-plugin.json

+  "displayName": "ODF(OpenShift Data Foundation) Plugin",
+  "description": "Console plugin for ODF",


Suggested change

"displayName": "ODF(OpenShift Data Foundation) Plugin",

"description": "Console plugin for ODF",

"displayName": "MCO Plugin",

"description": "Console plugin for MCO",

SanjalKatiyar · 2022-08-03T07:11:29Z

webpack.config.ts

@@ -5,25 +5,20 @@ import { ConsoleRemotePlugin } from '@openshift-console/dynamic-plugin-sdk-webpa
 import * as CopyWebpackPlugin from 'copy-webpack-plugin';
 import * as webpack from 'webpack';
 import type { Configuration as DevServerConfiguration } from 'webpack-dev-server';
+import MergeJsonWebpackPlugin from 'merge-jsons-webpack-plugin';


Suggested change

import MergeJsonWebpackPlugin from 'merge-jsons-webpack-plugin';

not used anywhere ?

SanjalKatiyar · 2022-08-03T07:19:02Z

package.json

+    "build": "NODE_ENV=production PLUGIN=odf I8N_NS=plugin__odf-console yarn build:plugin",
+    "build-mco": "NODE_ENV=production PLUGIN=mco I8N_NS=plugin__odf-multicluster-console yarn build:plugin",
+    "build-dev": "NODE_ENV=production PLUGIN=odf I8N_NS=plugin__odf-console yarn build:plugin",
+    "server:plugin": "cd plugins/${PLUGIN} && ts-node ../../scripts/generatePluginPackage.ts && yarn clean && NODE_ENV={MODE} I8N_NS=${I8N_NS} yarn ts-node ../../node_modules/.bin/webpack serve -c ../../webpack.config.ts",


NODE_ENV={MODE} this "MODE" is it some default env variable ? because we are not exporting it ourselves anywhere...

also do we need to NODE_ENV={MODE} I8N_NS=${I8N_NS} again during serving ? we are already exporting these during build command...

build command is for production and service is for dev setup which we are running locally, so yes we need this on both the places

okay... but "MODE" we have not initialized this variable anywhere...

SanjalKatiyar · 2022-08-03T07:21:18Z

package.json

+    "build": "NODE_ENV=production PLUGIN=odf I8N_NS=plugin__odf-console yarn build:plugin",
+    "build-mco": "NODE_ENV=production PLUGIN=mco I8N_NS=plugin__odf-multicluster-console yarn build:plugin",
+    "build-dev": "NODE_ENV=production PLUGIN=odf I8N_NS=plugin__odf-console yarn build:plugin",


"yarn build" and "yarn build-dev" are exactly same...

build-dev should not have NODE_ENV=production, i will change it

Signed-off-by: Gowtham Shanmugasundaram <gshanmug@redhat.com>

bipuladh · 2022-08-04T10:30:59Z

/approve
/lgtm

bipuladh · 2022-08-04T10:31:02Z

/test odf-console-e2e-aws

openshift-ci · 2022-08-04T10:31:07Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bipuladh, GowthamShanmugam

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:

~~OWNERS~~ [bipuladh]

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

bipuladh · 2022-08-04T10:47:40Z

/test images
/test odf-console-e2e-aws

bipuladh · 2022-08-04T14:12:35Z

/test odf-console-e2e-aws

bipuladh · 2022-08-04T16:00:37Z

/cherrypick release-4.11
/cherrypick release-4.11-compatibility

openshift-cherrypick-robot · 2022-08-04T16:01:18Z

@bipuladh: new pull request created: #362

In response to this:

/cherrypick release-4.11
/cherrypick release-4.11-compatibility

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

bipuladh · 2022-08-04T16:17:24Z

/cherrypick release-4.11-compatibility

openshift-cherrypick-robot · 2022-08-04T16:18:04Z

@bipuladh: new pull request created: #363

In response to this:

/cherrypick release-4.11-compatibility

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

GowthamShanmugam force-pushed the fix_2087078 branch from de3c310 to 9d3491a Compare July 29, 2022 06:48

GowthamShanmugam commented Jul 29, 2022

View reviewed changes

bipuladh requested changes Aug 1, 2022

View reviewed changes

openshift-ci bot assigned bipuladh Aug 1, 2022

GowthamShanmugam force-pushed the fix_2087078 branch 8 times, most recently from 583ba7a to 6373563 Compare August 2, 2022 17:35

bipuladh reviewed Aug 3, 2022

View reviewed changes

SanjalKatiyar reviewed Aug 3, 2022

View reviewed changes

GowthamShanmugam force-pushed the fix_2087078 branch 2 times, most recently from 6e267ee to ad1c1bc Compare August 4, 2022 09:21

Fix Overview tab is present under Storage section

8919f51

Signed-off-by: Gowtham Shanmugasundaram <gshanmug@redhat.com>

GowthamShanmugam force-pushed the fix_2087078 branch from ad1c1bc to 8919f51 Compare August 4, 2022 10:05

openshift-ci bot added the lgtm label Aug 4, 2022

openshift-ci bot added the approved label Aug 4, 2022

openshift-ci bot merged commit ec622f3 into red-hat-storage:master Aug 4, 2022

openshift-cherrypick-robot mentioned this pull request Aug 4, 2022

[release-4.11] Bug 2087078: Fix Overview tab is present under Storage section #362

Merged

openshift-cherrypick-robot mentioned this pull request Aug 4, 2022

[release-4.11-compatibility] Bug 2087078: Fix Overview tab is present under Storage section #363

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix Overview tab is present under Storage section #351

Fix Overview tab is present under Storage section #351

GowthamShanmugam commented Jul 28, 2022 •

edited

GowthamShanmugam commented Jul 28, 2022

GowthamShanmugam commented Jul 28, 2022

GowthamShanmugam Jul 29, 2022

GowthamShanmugam Jul 29, 2022

bipuladh Jul 29, 2022

bipuladh Aug 1, 2022

bipuladh Aug 3, 2022

bipuladh Aug 3, 2022

GowthamShanmugam Aug 3, 2022

bipuladh Aug 3, 2022

GowthamShanmugam Aug 3, 2022

GowthamShanmugam Aug 3, 2022

SanjalKatiyar Aug 3, 2022

SanjalKatiyar Aug 3, 2022

SanjalKatiyar Aug 3, 2022

SanjalKatiyar Aug 3, 2022

GowthamShanmugam Aug 3, 2022

SanjalKatiyar Aug 3, 2022

SanjalKatiyar Aug 3, 2022

GowthamShanmugam Aug 3, 2022 •

edited

bipuladh commented Aug 4, 2022

bipuladh commented Aug 4, 2022

openshift-ci bot commented Aug 4, 2022

bipuladh commented Aug 4, 2022

bipuladh commented Aug 4, 2022

bipuladh commented Aug 4, 2022

openshift-cherrypick-robot commented Aug 4, 2022

bipuladh commented Aug 4, 2022

openshift-cherrypick-robot commented Aug 4, 2022

@@ @@ -15,14 +15,6 @@ @@
                     }
                   }
                 },
-                {

		@@ -0,0 +1,8 @@
		/* Copyright Contributors to the Open Cluster Management project */

	"server:plugin": "cd plugins/${PLUGIN} && ts-node ../../scripts/generatePluginPackage.ts && yarn clean && NODE_ENV={MODE} I8N_NS=${I8N_NS} yarn ts-node ../../node_modules/.bin/webpack serve -c ../../webpack.config.ts",
	"server:plugin": "cd plugins/${PLUGIN} && ts-node ../../scripts/generatePluginPackage.ts && yarn clean && NODE_ENV={MODE} I8N_NS=${I8N_NS} yarn ts-node ../../node_modules/.bin/webpack serve",

		"displayName": "ODF(OpenShift Data Foundation) Plugin",
		"description": "Console plugin for ODF",

Fix Overview tab is present under Storage section #351

Fix Overview tab is present under Storage section #351

Conversation

GowthamShanmugam commented Jul 28, 2022 • edited

GowthamShanmugam commented Jul 28, 2022

GowthamShanmugam commented Jul 28, 2022

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

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

GowthamShanmugam Aug 3, 2022 • edited

Choose a reason for hiding this comment

bipuladh commented Aug 4, 2022

bipuladh commented Aug 4, 2022

openshift-ci bot commented Aug 4, 2022

bipuladh commented Aug 4, 2022

bipuladh commented Aug 4, 2022

bipuladh commented Aug 4, 2022

openshift-cherrypick-robot commented Aug 4, 2022

bipuladh commented Aug 4, 2022

openshift-cherrypick-robot commented Aug 4, 2022

GowthamShanmugam commented Jul 28, 2022 •

edited

GowthamShanmugam Aug 3, 2022 •

edited