merge conflict resolve

Author: durgatechvar

src/components.d.ts

@@ -135,6 +135,7 @@ export namespace Components {
         "doc": any;
     }
     interface EditorPage {
+        "mode": string;
         "permissions": string;
         "url": string;
     }
@@ -928,6 +929,7 @@ declare namespace LocalJSX {
         "doc"?: any;
     }
     interface EditorPage {
+        "mode"?: string;
         "permissions"?: string;
         "url"?: string;
     }

src/components/editorPage/editor-page/editor-page.tsx

@@ -13,6 +13,7 @@ import { formatJSON } from '../../../utils/utils';
 export class EditorPage {
   @Prop() url: string;
   @Prop() permissions: string;
+  @Prop() mode: string;
 
   @State() selectedNodeName: string;
   @State() nodeList: string[] = [];
@@ -43,7 +44,6 @@ export class EditorPage {
       .catch(err => {
         this.loadingNodes = false;
         this.nodeError = err;
-        console.log(err);
       });
   };
 
@@ -70,6 +70,14 @@ export class EditorPage {
     state.viewParameter.dispatch(transactionToFormatParameter);
   };
 
+  checkIfValidDemoQuery(value: string) {
+    const demoConstraints = ["drop", "addv", "addvertex", "addedge", "adde", "property", "addlabel"]
+    demoConstraints.forEach(constraint => {
+      if (value.toLowerCase().includes(constraint)) {
+        throw Error(`You can perform this operation in Demo mode !`)
+      }
+    })
+  }
   onClickRun = async () => {
     if (state.editorTextFlag) {
       state.selectedNodeName = null;
@@ -93,6 +101,9 @@ export class EditorPage {
 
         if (isValid) {
           state.timeTaken = null;
+
+          if (this.mode === "demo") this.checkIfValidDemoQuery(query)
+
           const res = await axios.post(`${state.hostUrl}/query/`, {
             query,
             parameters: JSON.parse(parameters),
@@ -108,9 +119,8 @@ export class EditorPage {
           state.errorMessage = error;
         }
       } catch (error) {
-        console.log({ error });
         state.isError = true;
-        state.errorMessage = error?.response?.data?.error ? error.response.data.error : 'Failed to fetch data from db server.';
+        state.errorMessage = error?.response?.data?.error ? error.response.data.error : error.message ?? 'Failed to fetch data from db server.';
       }
       state.isLoading = false;
     }

src/components/editorPage/editor-page/readme.md

@@ -9,6 +9,7 @@
 
 | Property      | Attribute     | Description | Type     | Default     |
 | ------------- | ------------- | ----------- | -------- | ----------- |
+| `mode`        | `mode`        |             | `string` | `undefined` |
 | `permissions` | `permissions` |             | `string` | `undefined` |
 | `url`         | `url`         |             | `string` | `undefined` |
 

src/components/editorPage/store.ts

@@ -195,15 +195,6 @@ onChange('nodes', value => {
   });
 });
 
-onChange('query', value => {
-  if (state.viewQuery) {
-    let transactionToAdd = state.viewQuery.state.update({
-      changes: { from: 0, to: state.viewQuery.state.doc.toString().length, insert: `${value}` },
-    });
-    state.viewQuery.dispatch(transactionToAdd);
-  }
-});
-
 onChange('queryParameter', value => {
   if (state.viewParameter) {
     let transactionToAdd = state.viewParameter.state.update({

src/index.html

@@ -27,7 +27,7 @@
     <!-- <editor-res></editor-res> -->
     <!-- <permission-editor url="http://localhost:3000/api/permissions" rolesurl="http://localhost:3000/api/permissions/all"></permission-editor> -->
     <!-- <tabs-component></tabs-component> -->
-    <!-- <editor-page url="http://localhost:3000/api/editor"></editor-page> -->
+    <editor-page url="http://localhost:3000/api/editor"></editor-page>
     <!-- <query-logs ></query-logs> -->
     <!-- <navigators-component></navigators-component> -->
     <!-- <users-component></users-component> -->
@@ -49,7 +49,7 @@
     <!-- <login-form></login-form> -->
   <!-- </fluid-container> -->
   <!-- <banner-component></banner-component> -->
-  <insert-node-model ></insert-node-model>
+  <!-- <insert-node-model ></insert-node-model> -->
   </div>
 </body>