Cleanup eslint error and remove not needed function (build 2)

Signed-off-by: Denis Golovin [email protected]

Author: dgolovin

build/archive.ts

@@ -54,7 +54,6 @@ export class Archive {
         fileName: string,
         prefix: string,
     ): Promise<void> {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return pify(targz.decompress)({
             src: zipFile,
             dest: extractTo,

src/componentsView.ts

@@ -20,7 +20,7 @@ export interface WorkspaceEntry {
 }
 
 class Labeled {
-    constructor(public label: string) {}
+    constructor(public label: string) { }
 }
 
 class Project extends Labeled {
@@ -31,20 +31,16 @@ class Application extends Labeled {
 
 type Entry = Project | Application | WorkspaceEntry | WorkspaceFolderComponent;
 
-export interface WorkspaceFolderComponent extends vsc.TreeItem{
+export interface WorkspaceFolderComponent extends vsc.TreeItem {
     project: string;
     application: string;
     contextUri: vsc.Uri;
 }
 
-function isWorkspaceFolderComponent(entry): entry is WorkspaceFolderComponent {
-    return entry.contextUri;
-}
-
 async function getComponentsInWorkspace(): Promise<WorkspaceFolderComponent[]> {
     const execs: Promise<CliExitData>[] = [];
     if (vsc.workspace.workspaceFolders) {
-        vsc.workspace.workspaceFolders.forEach((folder)=> {
+        vsc.workspace.workspaceFolders.forEach((folder) => {
             try {
                 execs.push(getInstance().execute(Command.viewEnv(), folder.uri.fsPath, false));
             } catch (ignore) {
@@ -61,7 +57,7 @@ async function getComponentsInWorkspace(): Promise<WorkspaceFolderComponent[]> {
                 const pathToS2iConfig = path.join(result.cwd.toString(), '.odo', 'config.yaml');
                 if (pathExistsSync(pathToS2iConfig)) {
                     // reconstruct env view form yaml file data
-                    const s2iConf = jsYaml.load(readFileSync(pathToS2iConfig, 'utf8')) as any;
+                    const s2iConf: any = jsYaml.load(readFileSync(pathToS2iConfig, 'utf8'));
                     compData = {
                         spec: {
                             appName: s2iConf.ComponentSettings.Application,
@@ -81,7 +77,7 @@ async function getComponentsInWorkspace(): Promise<WorkspaceFolderComponent[]> {
                 `Project: ${project}`,
                 `Application: ${application}`,
                 `Context: ${contextUri.fsPath}`,
-                ].join('\n');
+            ].join('\n');
             const description = `${project}/${application}`;
             return {
                 project,
@@ -120,9 +116,9 @@ export class ComponentsTreeDataProvider extends BaseTreeDataProvider<Entry> {
     }
 
     @vsCommand('openshift.component.revealInExplorer')
-    public static async revealInExplorer(context: Entry): Promise<void> {
-        if (isWorkspaceFolderComponent(context)) {
-            await vsc.commands.executeCommand('workbench.view.explorer', );
+    public static async revealInExplorer(context: WorkspaceFolderComponent): Promise<void> {
+        if (context.contextUri) {
+            await vsc.commands.executeCommand('workbench.view.explorer',);
             await vsc.commands.executeCommand('revealInExplorer', context.contextUri);
         }
     }
@@ -143,10 +139,8 @@ export class ComponentsTreeDataProvider extends BaseTreeDataProvider<Entry> {
         return ComponentsTreeDataProvider.dataProviderInstance;
     }
 
-    getTreeItem(element: Entry): vsc.TreeItem {
-        if (isWorkspaceFolderComponent(element)) {
-            return element;
-        }
+    getTreeItem(element: WorkspaceFolderComponent): vsc.TreeItem {
+        return element;
     }
 
     getChildren(element?: Entry): vsc.ProviderResult<Entry[]> {
@@ -156,4 +150,4 @@ export class ComponentsTreeDataProvider extends BaseTreeDataProvider<Entry> {
             return result;
         })
     }
-}
+}

test/ui/common/constants.ts

@@ -12,14 +12,14 @@ export const VIEWS = {
     compTypes: 'Component Types',
     watchSessions: 'Watch Sessions',
     debugSessions: 'Debug Sessions',
-    devFileRegistry: 'DefaultDevfileRegistry'
+    devFileRegistry: 'DefaultDevfileRegistry',
 };
 
 export const BUTTONS = {
     login: 'Login',
     kubeContext: 'Select Kubernetes Context',
     addCluster: 'Add OpenShift Cluster',
-    newComponent: 'New Component'
+    newComponent: 'New Component',
 };
 
 export const INPUTS = {
@@ -28,24 +28,25 @@ export const INPUTS = {
     newUserQuickPick: 'Add new user...',
     newFolderQuickPick: 'Add new context folder to workspace',
     yes: 'Yes',
-    no: 'No'
+    no: 'No',
 };
 
 export const MENUS = {
     newProject: 'New Project',
     delete: 'Delete',
-    push: 'Push'
+    push: 'Push',
 };
 
 export const COMPONENTS = {
     nodejsDevfile: 'nodejs (devfile)',
     devfileComponent: (name: string) => `${name} (devfile)`,
-    pushSuccess: 'Changes successfully pushed'
+    pushSuccess: 'Changes successfully pushed',
 };
 
 export const NOTIFICATIONS = {
-    deleteProjectWarning: (projectName: string) => `Do you want to delete Project '${projectName}'?`,
+    deleteProjectWarning: (projectName: string) =>
+        `Do you want to delete Project '${projectName}'?`,
     projectDeleteSuccess: (projectName: string) => `Project '${projectName}' successfully deleted`,
     savePasswordPrompt: 'Do you want to save username and password?',
-    loginSuccess: (cluster: string) => `Successfully logged in to '${cluster}'`
-};
+    loginSuccess: (cluster: string) => `Successfully logged in to '${cluster}'`,
+};