Gqlmerge

src/components/permissions-editor.ts

@@ -0,0 +1,74 @@
+import { customElement, LitElement, property, html, css } from "lit-element";
+import { SharedStyles } from '../styles/shared-styles';
+
+import "weightless/icon";
+import { MintPermission } from "screens/modeling/reducers";
+import { getAllUsersPermission } from "util/permission_utils";
+
+@customElement('permissions-editor')
+export class PermissionsEditor extends LitElement {
+    @property({type: Object})
+    public permissions: MintPermission[];
+
+    @property({type: Object})
+    private _permission: MintPermission;
+
+    static get styles() {
+        return [SharedStyles, css`
+        fieldset {
+            margin: 10px 0px;
+            padding: 5px 10px;
+            border: 1px solid #D9D9D9;
+            border-radius: 5px;
+        }
+        fieldset legend {
+            font-size: 10px;
+        }
+        `];
+    }
+
+    private _changedPublicPermission(e) {
+        this._permission.read = !this._permission.read;
+        if(!this._permission.read)
+            this._permission.write = false;
+        this.requestUpdate();
+    }
+
+    private _changedWritePermission(e) {
+        this._permission.write = !this._permission.write;
+        this.requestUpdate();
+    }
+
+    public setPermissions(permissions: MintPermission[]) {
+        this._permission = Object.assign({}, getAllUsersPermission(permissions ?? []));
+        this.permissions = [this._permission];
+        this.requestUpdate();
+    }
+
+    protected render() {
+        if(!this._permission) {
+            return html``;
+        }
+        console.log(this._permission);
+        return html`
+            <div class="input_full">
+                <label>Sharing</label>
+            </div>
+            <div class="formRow" style="justify-content: start">
+                <div style="width: 200px">
+                    <input type="checkbox" name="public" id="public"
+                        @click="${this._changedPublicPermission}"
+                        .checked="${this._permission.read}">
+                    <label for="public">Publicly Visible</label>
+                </div>
+                <div style="width: 200px">
+                    <input type="checkbox" name="writable" id="writable"
+                        .disabled="${!this._permission.read}"
+                        @click="${this._changedWritePermission}"
+                        .checked="${this._permission.read && this._permission.write}">
+                    <label for="writable">Publicly Writable</label>
+                </div>
+            </div>
+        `;
+    }
+}

src/components/task-editor.ts

@@ -16,6 +16,9 @@ import { IdMap } from "app/reducers";
 import { getCategorizedRegions } from "util/state_functions";
 import { goToPage } from "app/actions";
 
+import "./permissions-editor";
+import { PermissionsEditor } from "./permissions-editor";
+
 @customElement('task-editor')
 export class TaskEditor extends connect(store)(LitElement) {
     @property({type: Object})
@@ -112,6 +115,7 @@ export class TaskEditor extends connect(store)(LitElement) {
             <div slot="content">
                 <form id="taskForm">
                    ${this._renderTaskForm()}
+                   <permissions-editor id="task_permissions"></permissions-editor>
                 </form>
             </div>
             <div slot="footer">
@@ -220,6 +224,7 @@ export class TaskEditor extends connect(store)(LitElement) {
         (form.elements["task_region"] as HTMLSelectElement).value = ""; //this.problem_statement.regionid!;
         (form.elements["task_from"] as HTMLInputElement).value = toDateString(dates?.start_date);
         (form.elements["task_to"] as HTMLInputElement).value = toDateString(dates?.end_date);
+        (form.querySelector("#task_permissions") as PermissionsEditor).setPermissions([]);
 
         this._selectedIntervention = null;
     }
@@ -247,6 +252,7 @@ export class TaskEditor extends connect(store)(LitElement) {
         (form.elements["task_to"] as HTMLInputElement).value = toDateString(dates.end_date);
         (form.elements["response_variable"] as HTMLInputElement).value = response_variable;
         (form.elements["driving_variable"] as HTMLInputElement).value = driving_variable;
+        (form.querySelector("#task_permissions") as PermissionsEditor).setPermissions(task.permissions);
 
         this._selectedIntervention = getVariableIntervention(driving_variable);
     }
@@ -291,6 +297,7 @@ export class TaskEditor extends connect(store)(LitElement) {
             let task_region = (form.elements["task_region"] as HTMLInputElement).value;
             if(!task_region)
                 task_region = this._regionid;
+            let task_permissions = (form.querySelector("#task_permissions") as PermissionsEditor).permissions;
 
             showNotification("saveNotification", this.shadowRoot!);
             // If no taskid then this is a new task
@@ -309,6 +316,7 @@ export class TaskEditor extends connect(store)(LitElement) {
                 this.task.driving_variables = driving_variable ? [driving_variable] : [],
                 this.task.response_variables = response_variable ? [response_variable] : [],
                 this.task.events.push(getUpdateEvent(task_name) as TaskEvent);
+                this.task.permissions = task_permissions;
                 // End of Temporary Addition
 
                 // Update the task
@@ -340,7 +348,8 @@ export class TaskEditor extends connect(store)(LitElement) {
                         end_date: new Date(task_to)
                     },
                     threads: {},
-                    events: [getCreateEvent(task_name) as TaskEvent]
+                    events: [getCreateEvent(task_name) as TaskEvent],
+                    permissions: task_permissions
                 } as Task;
 
                 // Create a default thread for this task
@@ -355,7 +364,8 @@ export class TaskEditor extends connect(store)(LitElement) {
                     data: {},
                     model_ensembles: {},
                     execution_summary: {},
-                    events: [getCreateEvent("Default Thread Created") as ThreadEvent]
+                    events: [getCreateEvent("Default Thread Created") as ThreadEvent],
+                    permissions: task_permissions
                 } as Thread
 
                 // Create the Task along with default thread

src/components/thread-editor.ts

@@ -8,6 +8,9 @@ import { getUpdateEvent, getCreateEvent } from "util/graphql_adapter";
 import { updateThreadInformation, addThread } from "screens/modeling/actions";
 import { toDateString } from "util/date-utils";
 import { getLatestEventOfType } from "util/event_utils";
+import { PermissionsEditor } from "./permissions-editor";
+
+import "./permissions-editor";
 
 @customElement('thread-editor')
 export class ThreadEditor extends LitElement {
@@ -116,6 +119,7 @@ export class ThreadEditor extends LitElement {
                     </div>
                 </div>
                 <br />
+                <permissions-editor id="thread_permissions"></permissions-editor>
                 </form>
             </div>
             <div slot="footer">
@@ -128,12 +132,13 @@ export class ThreadEditor extends LitElement {
 
     _onEditThreadSubmit() {
         let form:HTMLFormElement = this.shadowRoot!.querySelector<HTMLFormElement>("#threadForm")!;
-        if(formElementsComplete(form, ["thread_name"])) {
+        //if(formElementsComplete(form, ["thread_name"])) {
             let threadid = (form.elements["threadid"] as HTMLInputElement).value;
             let thread_name = (form.elements["thread_name"] as HTMLInputElement).value;
             let thread_from = (form.elements["thread_from"] as HTMLInputElement).value;
             let thread_to = (form.elements["thread_to"] as HTMLInputElement).value;
             let thread_notes = (form.elements["thread_notes"] as HTMLInputElement).value;
+            let thread_permissions = (form.querySelector("#thread_permissions") as PermissionsEditor).permissions;
 
             showNotification("saveNotification", this.shadowRoot!);
 
@@ -147,6 +152,7 @@ export class ThreadEditor extends LitElement {
                     end_date: new Date(thread_to)
                 };
                 thread.events = [getUpdateEvent(thread_notes) as ThreadEvent];
+                thread.permissions = thread_permissions;
                 updateThreadInformation(thread);
             }
             else {
@@ -164,16 +170,17 @@ export class ThreadEditor extends LitElement {
                     datasets: {},
                     model_ensembles: {},
                     execution_summary: {},
-                    events: [getCreateEvent(thread_notes)]
+                    events: [getCreateEvent(thread_notes)],
+                    permissions: thread_permissions
                 } as ThreadInfo;
 
                 addThread(this.task, thread);
             }
             hideDialog("threadDialog", this.shadowRoot!);
-        }
+        /*}
         else {
             showNotification("formValuesIncompleteNotification", this.shadowRoot!);
-        }
+        }*/
     }
 
     _onEditThreadCancel() {
@@ -198,6 +205,7 @@ export class ThreadEditor extends LitElement {
         (form.elements["thread_from"] as HTMLInputElement).value = toDateString(dates.start_date);
         (form.elements["thread_to"] as HTMLInputElement).value = toDateString(dates.end_date);
         (form.elements["thread_notes"] as HTMLInputElement).value = "";
+        (form.querySelector("#thread_permissions") as PermissionsEditor).setPermissions([]);
     }
 
     setThread(thread: ThreadInfo) {
@@ -214,6 +222,7 @@ export class ThreadEditor extends LitElement {
             (form.elements["thread_from"] as HTMLInputElement).value = toDateString(dates.start_date);
             (form.elements["thread_to"] as HTMLInputElement).value = toDateString(dates.end_date);
             (form.elements["thread_notes"] as HTMLInputElement).value = notes;
+            (form.querySelector("#thread_permissions") as PermissionsEditor).setPermissions(thread.permissions);
         } 
     }
 }

src/queries/emulator/get-model-config-inputs.graphql

@@ -0,0 +1,10 @@
+query model_inputs_for_model_config($regionId: String!, $modelConfiguration: String!) {
+  model_parameter(distinct_on: name, where: {model: {model_configuration: {_eq: $modelConfiguration}, thread_models: {thread: {_or: [{region_id: {_eq: $regionId}}, {region: {parent_region_id: {_eq: $regionId}}}]}}}}) {
+    name
+    datatype
+  }
+  model_io(distinct_on: name, where: {model_inputs: {model: {model_configuration: {_eq: $modelConfiguration}, thread_models: {thread: {_or: [{region_id: {_eq: $regionId}}, {region: {parent_region_id: {_eq: $regionId}}}]}}}}}) {
+    name
+    type
+  }
+}

src/queries/emulator/get-model-input-values.graphql

@@ -0,0 +1,25 @@
+query model_inputs_for_model($regionId: String!, $inputName: String!, $modelType: String!) {
+  model_io(where: {name: {_eq: $inputName}, model_inputs: {model: {model_name: {_eq: $modelType}, thread_models: {thread: {_or: [{region_id: {_eq: $regionId}}, {region: {parent_region_id: {_eq: $regionId}}}]}}}}}) {
+    fixed_bindings {
+      resource {
+        id
+        name
+        url
+      }
+    }
+    execution_data_bindings(
+      where: {
+        execution: {
+          status: {_eq: "SUCCESS"}
+          model: {model_name: {_eq: $modelType}, thread_models: {thread: {_or: [{region_id: {_eq: $regionId}}, {region: {parent_region_id: {_eq: $regionId}}}]}}}
+        }
+      }
+      distinct_on: resource_id) {
+      resource {
+        id
+        name
+        url
+      }
+    }
+  }
+}

src/queries/emulator/get-model-parameter-values.graphql

@@ -0,0 +1,16 @@
+query model_parameters_for_model($regionId: String!, $inputName: String!, $modelType: String!) {
+  model_parameter(where: {name: {_eq: $inputName}, model: {model_name: {_eq: $modelType}, thread_models: {thread: {_or: [{region_id: {_eq: $regionId}}, {region: {parent_region_id: {_eq: $regionId}}}]}}}}) {
+    datatype
+    fixed_value
+    execution_parameter_bindings(
+      where: {
+        execution: {
+          status: {_eq: "SUCCESS"}
+          model: {model_name: {_eq: $modelType}, thread_models: {thread: {_or: [{region_id: {_eq: $regionId}}, {region: {parent_region_id: {_eq: $regionId}}}]}}}
+        }
+      }, 
+      distinct_on: parameter_value) {
+      parameter_value
+    }
+  }
+}

src/queries/emulator/get-model-type-configs.graphql

@@ -0,0 +1,7 @@
+query model_configurations_for_model($regionId: String!, $modelType: String!) {
+  model(distinct_on:model_configuration where: {model_name: {_eq: $modelType}, thread_models: {thread: {_or: [{region_id: {_eq: $regionId}}, {region: {parent_region_id: {_eq: $regionId}}}]}}}) {
+    name
+    description
+    model_configuration
+  }
+}

src/queries/emulator/get-model-type-io.graphql

@@ -0,0 +1,14 @@
+query model_inputs_for_model($regionId: String!, $modelType: String!) {
+  model_parameter(distinct_on: name, where: {model: {model_name: {_eq: $modelType}, thread_models: {thread: {_or: [{region_id: {_eq: $regionId}}, {region: {parent_region_id: {_eq: $regionId}}}]}}}}) {
+    name
+    datatype
+  }
+  model_inputs: model_io(distinct_on: name, where: {model_inputs: {model: {model_name: {_eq: $modelType}, thread_models: {thread: {_or: [{region_id: {_eq: $regionId}}, {region: {parent_region_id: {_eq: $regionId}}}]}}}}}) {
+    name
+    type
+  }
+  model_outputs: model_io(distinct_on: name, where: {model_outputs: {model: {model_name: {_eq: $modelType}, thread_models: {thread: {_or: [{region_id: {_eq: $regionId}}, {region: {parent_region_id: {_eq: $regionId}}}]}}}}}) {
+    name
+    type
+  }
+}

src/queries/emulator/model-executions.graphql

@@ -67,7 +67,7 @@ query model_executions($modelTypes: [String!], $regionId: String!) {
           parameter_value
         }
       }
-      executions_aggregate {
+      executions_aggregate(where: {execution: {status: {_eq: "SUCCESS"}}}) {
         aggregate {
           count
         }

src/queries/execution/executions-for-thread-model.graphql

@@ -0,0 +1,18 @@
+#import "../fragments/execution-info.graphql"
+
+query executions_for_thread_model( 
+  $threadModelId: uuid!,
+  $start: Int!,
+  $limit: Int!,
+  $orderBy: [execution_order_by!]) {
+	execution (
+        offset:$start, limit:$limit, order_by:$orderBy,
+        where: {
+            thread_model_executions: {
+                thread_model_id:{_eq: $threadModelId}
+            }
+        }
+    ) {
+        ...execution_info
+    }
+}

src/queries/execution/thread-execution-summary-subscription.graphql

@@ -0,0 +1,12 @@
+#import "../fragments/execution-summary-info.graphql"
+
+subscription execution_summary(
+  $threadModelId: uuid!) {
+	thread_model_execution_summary (
+    where: {
+        thread_model_id:{_eq: $threadModelId}
+    }
+  ) {
+    ...execution_summary_info
+  }
+}

src/queries/fragments/emulator-execution-info.graphql

@@ -0,0 +1,36 @@
+fragment emulator_execution_info on execution {
+    id
+    start_time
+    end_time
+    status
+    run_progress
+    run_id
+    execution_engine
+    model_id
+    parameter_bindings {
+        model_parameter {
+            name
+        }
+        parameter_value
+    }
+    data_bindings {
+        model_io {
+            name
+        }
+        resource {
+            id
+            name
+            url
+        }
+    }
+    results {
+        model_output {
+            name
+        }
+        resource {
+            id
+            name
+            url
+        }
+    }
+}

src/queries/fragments/execution-status-info.graphql

@@ -0,0 +1,10 @@
+fragment execution_info on execution {
+    id
+    start_time
+    end_time
+    status
+    run_progress
+    run_id
+    execution_engine
+    model_id
+}