feat: enable conda complete depending presence of quetzUrl

mamba-org · Jul 7, 2021 · 72a2f70 · 72a2f70
1 parent cfbe405
commit 72a2f70
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 13 deletions.
diff --git a/mamba_gator/navigator/main.py b/mamba_gator/navigator/main.py
@@ -66,7 +66,7 @@ class MambaNavigator(LabServerApp):
     workspaces_dir = os.path.join(HERE, "workspaces")
 
     quetz_url = Unicode(
-        'http://localhost:8000',
+        '',
         config=True,
         help="The Quetz server to use for creating new environments"
     )

diff --git a/packages/common/src/components/CondaEnvList.tsx b/packages/common/src/components/CondaEnvList.tsx
@@ -58,7 +58,7 @@ export interface IEnvListProps {
   /**
    * Environment solve handler
    */
-  onSolve(): void;
+  onSolve?: (() => void) | false;
 }
 
 /**

diff --git a/packages/common/src/components/CondaEnvToolBar.tsx b/packages/common/src/components/CondaEnvToolBar.tsx
@@ -56,7 +56,7 @@ export interface ICondaEnvToolBarProps {
   /**
    * Solve environment handler
    */
-  onSolve(): void;
+  onSolve?: (() => void) | false;
 }
 
 export const CondaEnvToolBar = (props: ICondaEnvToolBarProps): JSX.Element => {
@@ -85,11 +85,13 @@ export const CondaEnvToolBar = (props: ICondaEnvToolBarProps): JSX.Element => {
           tooltip="Create"
           onClick={props.onCreate}
         />
-        <ToolbarButtonComponent
-          icon={buildIcon}
-          tooltip="Solve new"
-          onClick={props.onSolve}
-        />
+        {props.onSolve && (
+          <ToolbarButtonComponent
+            icon={buildIcon}
+            tooltip="Solve new"
+            onClick={props.onSolve}
+          />
+        )}
         <Button
           className="jp-ToolbarButtonComponent"
           disabled={props.isBase}

diff --git a/packages/common/src/components/NbConda.tsx b/packages/common/src/components/NbConda.tsx
@@ -429,7 +429,7 @@ export class NbConda extends React.Component<ICondaEnvProps, ICondaEnvState> {
           onExport={this.handleExportEnvironment}
           onRefresh={this.handleRefreshEnvironment}
           onRemove={this.handleRemoveEnvironment}
-          onSolve={this.handleSolveEnvironment}
+          onSolve={this.props.model.quetzUrl && this.handleSolveEnvironment}
         />
         <CondaPkgPanel
           height={this.props.height}

diff --git a/packages/common/src/services.ts b/packages/common/src/services.ts
@@ -74,7 +74,6 @@ export interface ICancellableAction {
 export class CondaEnvironments implements IEnvironmentManager {
   constructor(settings?: ISettingRegistry.ISettings) {
     this._environments = new Array<Conda.IEnvironment>();
-
     if (settings) {
       this._updateSettings(settings);
       settings.changed.connect(this._updateSettings, this);
@@ -453,8 +452,7 @@ export class CondaEnvironments implements IEnvironmentManager {
   private _packageManager = new CondaPackage();
   private _whitelist =
     PageConfig.getOption('whitelist').toLowerCase() === 'true';
-  private _quetzUrl =
-    PageConfig.getOption('quetzUrl') || 'http://localhost:8000';
+  private _quetzUrl = PageConfig.getOption('quetzUrl');
   private _quetzSolverUrl = PageConfig.getOption('quetzSolverUrl');
 }
 

diff --git a/packages/labextension/schema/plugin.json b/packages/labextension/schema/plugin.json
@@ -50,7 +50,7 @@
       "type": "string",
       "title": "Quetz package server",
       "description": "The Quetz server to use for creating new environments",
-      "default": "http://localhost:8000"
+      "default": ""
     },
     "quetzSolverUrl": {
       "type": "string",

diff --git a/packages/labextension/src/CondaCompleteEditor.tsx b/packages/labextension/src/CondaCompleteEditor.tsx
@@ -183,6 +183,10 @@ function activate(
   const namespace = 'conda';
   const tracker = new WidgetTracker<DocumentWidget>({ namespace });
 
+  if (!environmentManager.quetzUrl) {
+    return tracker;
+  }
+
   restorer.restore(tracker, {
     command: 'docmanager:open',
     args: widget => ({ path: widget.context.path, factory: FACTORY }),
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,7 +58,7 @@ export interface IEnvListProps { @@
       /**
        * Environment solve handler
        */
-      onSolve(): void;
+      onSolve?: (() => void) | false;
     }
     /**
@@ Expand Down @@