Merge branch 'master' into server_settings

Author: jahn96

.gitignore

@@ -31,7 +31,6 @@ eggs/
 lib/
 lib64/
 parts/
-dist/
 sdist/
 var/
 wheels/

dist/jupyterlab-code-snippets-2.0.0.tar.gz

@@ -2,6 +2,11 @@
 
 Changelog
 ---------
+
+v2.0.1
+^^^^^^
+* Fixed the issue with creating the snippet from scratch or editing the snippet in the editor.
+
 v2.0.0
 ^^^^^^
 * Fixed the issue with the keyboard shortcut by making it user-configurable.

dist/jupyterlab-code-snippets-2.0.1.tar.gz

@@ -1,6 +1,6 @@
 {
   "name": "jupyterlab-code-snippets",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "EXPERIMENTAL: Save, reuse, and share code snippets using JupyterLab Code Snippets",
   "keywords": [
     "jupyter",

dist/jupyterlab_code_snippets-2.0.0-py3-none-any.whl

@@ -32,6 +32,7 @@ import { CodeSnippetService } from './CodeSnippetService';
 import { CodeSnippetWidget } from './CodeSnippetWidget';
 import { SUPPORTED_LANGUAGES } from './CodeSnippetLanguages';
 import { CodeSnippetEditorTags } from './CodeSnippetEditorTags';
+import { saveOverWriteFile } from './CodeSnippetInputDialog';
 
 /**
  * CSS style classes
@@ -364,14 +365,14 @@ export class CodeSnippetEditor extends ReactWidget {
       message += 'Name must be filled out\n';
       status = false;
     }
-    if (name.match(/[^a-z0-9_]+/)) {
+    if (name.match(/[^a-zA-Z0-9_]+/)) {
       message += 'Wrong format of the name\n';
       status = false;
     }
-    if (description === '') {
-      message += 'Description must be filled out\n';
-      status = false;
-    }
+    // if (description === '') {
+    //   message += 'Description must be filled out\n';
+    //   status = false;
+    // }
     if (description.match(/[^a-zA-Z0-9_ ,.?!]+/)) {
       message += 'Wrong format of the description\n';
       status = false;
@@ -579,18 +580,17 @@ export class CodeSnippetEditor extends ReactWidget {
           ></input>
           <p className={CODE_SNIPPET_EDITOR_INPUTNAME_VALIDITY}>
             {
-              'Name of the code snippet MUST be lowercased, alphanumeric or composed of underscore(_)'
+              'Name of the code snippet MUST be alphanumeric or composed of underscore(_)'
             }
           </p>
           <label className={CODE_SNIPPET_EDITOR_LABEL}>
-            Description (required)
+            Description (optional)
           </label>
           <input
             className={CODE_SNIPPET_EDITOR_DESC_INPUT}
             defaultValue={this._codeSnippetEditorMetaData.description}
             placeholder={'Description'}
             type="text"
-            required
             pattern={'[a-zA-Z0-9_ ,.?!]+'}
             onMouseDown={(
               event: React.MouseEvent<HTMLInputElement, MouseEvent>

dist/jupyterlab_code_snippets-2.0.1-py3-none-any.whl

@@ -71,10 +71,24 @@ export function CodeSnippetInputDialog(
     }
   }
 
+  const body: InputHandler = new InputHandler(tags);
+
+  return showInputDialog(tags, idx, codeSnippetWidget, code, body);
+}
+
+/**
+ * This function creates the actual input form and processes the inputs given.
+ */
+export function showInputDialog(
+  tags: string[],
+  idx: number,
+  codeSnippetWidget: CodeSnippetWidget,
+  code: string[],
+  body: InputHandler
+): Promise<Contents.IModel | null> {
   return showCodeSnippetForm({
     title: 'Save Code Snippet',
-    body: new InputHandler(tags),
-    // focusNodeSelector: 'input',
+    body: body,
     buttons: [
       CodeSnippetForm.cancelButton(),
       CodeSnippetForm.okButton({ label: 'Save' })
@@ -87,15 +101,15 @@ export function CodeSnippetInputDialog(
     console.log(idx);
 
     if (validateForm(result) === false) {
-      return CodeSnippetInputDialog(codeSnippetWidget, code, idx); // This works but it wipes out all the data they entered previously...
+      showInputDialog(tags, idx, codeSnippetWidget, code, body);
     } else {
       // if (idx === -1) {
       // idx = codeSnippetWidget.codeSnippetWidgetModel.snippets.length;
       // }
 
       const tags = result.value.slice(3);
       const newSnippet: ICodeSnippet = {
-        name: result.value[0].replace(' ', '').toLowerCase(),
+        name: result.value[0].replace(' ', ''),
         description: result.value[1],
         language: result.value[2],
         code: code,
@@ -109,7 +123,7 @@ export function CodeSnippetInputDialog(
             snippet,
             newSnippet
           );
-
+          console.log('uh reached here');
           result
             .then(newSnippets => {
               codeSnippetWidget.renderCodeSnippetsSignal.emit(newSnippets);
@@ -238,20 +252,18 @@ export function validateForm(
     message += 'Name must be filled out\n';
     status = false;
   }
-  if (name.match(/[^a-z0-9_]+/)) {
+  if (name.match(/[^a-zA-Z0-9_]+/)) {
+    //allow lowercase, uppercase, alphanumeric, and underscore
     message += 'Wrong format of the name\n';
     status = false;
   }
-  if (description === '') {
-    message += 'Description must be filled out\n';
-    status = false;
-  }
   if (description.match(/[^a-zA-Z0-9_ ,.?!]+/)) {
+    //alphanumeric but can include space or punctuation
     message += 'Wrong format of the description\n';
     status = false;
   }
   if (language === '') {
-    message += 'Language must be filled out';
+    message += 'Language must be filled out\n';
     status = false;
   }
   if (!SUPPORTED_LANGUAGES.includes(language)) {
@@ -321,7 +333,7 @@ class Private {
     const body = document.createElement('form');
     const nameValidity = document.createElement('p');
     nameValidity.textContent =
-      'Name of the code snippet MUST be lowercased, alphanumeric, or composed of underscore(_)';
+      'Name of the code snippet MUST be alphanumeric, or composed of underscore(_)';
     nameValidity.className = CODE_SNIPPET_INPUTNAME_VALIDITY;
 
     const descriptionValidity = document.createElement('p');
@@ -338,10 +350,9 @@ class Private {
     name.onblur = Private.handleOnBlur;
 
     const descriptionTitle = document.createElement('label');
-    descriptionTitle.textContent = 'Description (required)';
+    descriptionTitle.textContent = 'Description (optional)';
     const description = document.createElement('input');
     description.className = CODE_SNIPPET_DIALOG_INPUT;
-    description.required = true;
     description.pattern = '[a-zA-Z0-9_ ,.?!]+';
     description.onblur = Private.handleOnBlur;