Skip to content

Add Welcome content for Application Explorer View #1985

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
dgolovin merged 7 commits into from
Feb 23, 2021
Merged

Add Welcome content for Application Explorer View #1985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3cdbbec
Add Welcome content for Application Explorer View
dgolovin Feb 20, 2021
a071519
Update welcome text and button names
dgolovin Feb 22, 2021
a38c637
Fix error in package.json
dgolovin Feb 22, 2021
1d73eee
Fix eslint errors
dgolovin Feb 22, 2021
57557e5
Fix unit test errors
dgolovin Feb 22, 2021
9efe88c
Remove commented code
dgolovin Feb 22, 2021
b0f439e
Update button names for view welcome page
dgolovin Feb 22, 2021
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
6 changes: 6 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,12 @@
}
]
},
"viewsWelcome": [
{
"view": "openshiftProjectExplorer",
"contents": "Cluster is not accessible or you are not logged in.\n[Login](command:openshift.explorer.login)\n[Select Kubernetes Context ](command:openshift.explorer.switchContext)\n[Add OpenShift Cluster](command:openshift.explorer.addCluster)"
}
],
"menus": {
"explorer/context": [
{
Expand Down
13 changes: 0 additions & 13 deletions src/odo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,13 +490,6 @@ export class OdoImpl implements Odo {
'"system:anonymous"',
];

private readonly serverDownMessages = [
'Unable to connect to OpenShift cluster, is it down?',
'no such host',
'no route to host',
'connection refused',
];

public readonly subject: Subject<OdoEvent> = new Subject<OdoEvent>();

public static get Instance(): Odo {
Expand Down Expand Up @@ -539,12 +532,6 @@ export class OdoImpl implements Odo {
const result: cliInstance.CliExitData = await this.execute(
Command.printOdoVersionAndProjects(), process.cwd(), false
);
if (this.odoLoginMessages.some((element) => result.stderr ? result.stderr.includes(element) : false)) {
return[new OpenShiftLoginRequired()];
}
if (this.serverDownMessages.some((element) => result.stderr ? result.stderr.includes(element) : false)) {
return [new OpenShiftClusterDown()];
}
commands.executeCommand('setContext', 'isLoggedIn', true);
clusters = result.stdout.trim().split('\n').filter((value) => {
return value.includes('Server:');
Expand Down
20 changes: 0 additions & 20 deletions test/unit/odo.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,26 +614,6 @@ suite('odo', () => {
assert.equal(cluster[0].getName(), clusterUrl);
});

test('show error message if cluster is not login', async () => {
sandbox.stub(odo.OdoImpl.prototype, 'execute').onFirstCall().resolves({
error: undefined,
stdout: '',
stderr: 'Please log in to the cluster'
});
const cluster: odo.OpenShiftObject[] = await odo.getInstance().getClusters();
assert.equal(cluster[0].getName(), 'Please log in to the cluster');
});

test('show message if cluster is down', async () => {
sandbox.stub(odo.OdoImpl.prototype, 'execute').onFirstCall().resolves({
error: undefined,
stdout: '',
stderr: 'Unable to connect to OpenShift cluster, is it down?'
});
const cluster: odo.OpenShiftObject[] = await odo.getInstance().getClusters();
assert.equal(cluster[0].getName(), 'Cannot connect to the OpenShift cluster');
});

test('extension uses oc version to get cluster url as a backup plan', async () => {
sandbox.stub(odo.OdoImpl.prototype, 'execute').onFirstCall().resolves({
error: undefined,
Expand Down
⚡