@windward/integrations 0.0.8 → 0.0.10

package/components/Integration/Driver/ManageAtutor.vue

@@ -16,6 +16,7 @@
                     />
 
                     <v-text-field
+                        ref="atutor_url"
                         v-model="integration.metadata.config.url"
                         :label="
                             $t(
@@ -27,6 +28,7 @@
                                 'windward.integrations.components.integration.driver.atutor.url_hint'
                             )
                         "
+                        :rules="urlValidation"
                     ></v-text-field>
                     <v-text-field
                         v-model="integration.metadata.config.username"
@@ -47,6 +49,7 @@
                     ></v-text-field>
 
                     <v-text-field
+                        ref="aws-url"
                         v-model="integration.metadata.config.aws_secure_url"
                         :label="
                             $t(
@@ -58,6 +61,7 @@
                                 'windward.integrations.components.integration.driver.atutor.aws_secure_url_hint'
                             )
                         "
+                        :rules="urlValidation"
                     ></v-text-field>
 
                     <v-switch
@@ -100,6 +104,17 @@ export default {
             // integration: { metadata: {...} } The integration object to write to. Defined and loaded in ManageBase.vue
             errorMessage: '',
             testConnectionLoading: false,
+            urlValidation: [
+                (value) => {
+                    if (value && value.slice(-1) === '/') {
+                        return this.$t(
+                            'windward.integrations.components.integration.driver.remove_slash'
+                        )
+                    } else {
+                        return true
+                    }
+                },
+            ],
         }
     },
     methods: {
@@ -115,21 +130,29 @@ export default {
         },
         async onTestConnection() {
             this.testConnectionLoading = true
-            const response = await this.testConnection(
-                this.integration.metadata
-            )
+            let response = { result: false }
+            try {
+                response = await this.testConnection(this.integration.metadata)
 
-            if (response.result) {
-                this.errorMessage = ''
-                this.$dialog.success(
-                    this.$t(
-                        'windward.integrations.shared.error.connect_success'
+                if (response.result) {
+                    this.errorMessage = ''
+                    this.$dialog.success(
+                        this.$t(
+                            'windward.integrations.shared.error.connect_success'
+                        )
                     )
-                )
-            } else {
-                this.errorMessage = response.message
+                } else {
+                    this.errorMessage = response.message
+                    this.$dialog.error(
+                        this.$t(
+                            'windward.integrations.shared.error.connect_fail'
+                        )
+                    )
+                }
+            } catch (e) {
+                console.error(e)
                 this.$dialog.error(
-                    this.$t('windward.integrations.shared.error.connect_fail')
+                    this.$t('windward.integrations.shared.error.unknown')
                 )
             }
 

package/components/Integration/Driver/ManageResourcespace.vue

@@ -0,0 +1,137 @@
+<template>
+    <div>
+        <div v-if="!render" class="integration-loading">
+            <v-progress-circular size="128" indeterminate />
+        </div>
+        <div v-if="render">
+            <v-row justify="center" align="center" class="mt-5">
+                <v-col cols="12">
+                    <v-switch
+                        v-model="integration.enabled"
+                        :label="
+                            $t(
+                                'windward.integrations.components.integration.driver.enabled'
+                            )
+                        "
+                    />
+
+                    <v-text-field
+                        v-model="integration.metadata.config.url"
+                        :label="
+                            $t(
+                                'windward.integrations.components.integration.driver.resourcespace.url'
+                            )
+                        "
+                        :hint="
+                            $t(
+                                'windward.integrations.components.integration.driver.resourcespace.url_hint'
+                            )
+                        "
+                    ></v-text-field>
+                    <v-text-field
+                        v-model="integration.metadata.config.username"
+                        :label="
+                            $t(
+                                'windward.integrations.components.integration.driver.resourcespace.username'
+                            )
+                        "
+                    ></v-text-field>
+                    <v-text-field
+                        v-model="integration.metadata.config.key"
+                        :label="
+                            $t(
+                                'windward.integrations.components.integration.driver.resourcespace.key'
+                            )
+                        "
+                        type="password"
+                    ></v-text-field>
+
+                    <v-switch
+                        v-model="integration.metadata.config.ssl"
+                        :label="
+                            $t(
+                                'windward.integrations.components.integration.driver.ssl_enabled'
+                            )
+                        "
+                    />
+
+                    <TestConnection
+                        :disabled="
+                            !integration.metadata.config.url ||
+                            !integration.metadata.config.username ||
+                            !integration.metadata.config.key
+                        "
+                        :loading="testConnectionLoading"
+                        :errors="errorMessage"
+                        @click="onTestConnection"
+                    ></TestConnection>
+                </v-col>
+            </v-row>
+        </div>
+    </div>
+</template>
+
+<script>
+import TestConnection from '../TestConnection.vue'
+import ManageBaseVue from './ManageBase.vue'
+
+export default {
+    name: 'ManageResourcespaceDriver',
+    components: { TestConnection },
+    extends: ManageBaseVue,
+    data() {
+        return {
+            // formValid: true|false If this form is "complete" and passed validation on THIS component. Defined and watched in ManageBase.vue
+            // render: true|false If we should show the form aka when validation has passed. Defined and managed in ManageBase.vue
+            // integration: { metadata: {...} } The integration object to write to. Defined and loaded in ManageBase.vue
+            errorMessage: '',
+            testConnectionLoading: false,
+        }
+    },
+    methods: {
+        /**
+         * Lifecycle event called from ManageBase.vue when async fetch() completes.
+         * Once called this.integration will be available containing the integration model (or a new one)
+         */
+        onIntegrationLoaded() {
+            // Set SSL to enabled by default
+            if (_.get(this.integration.metadata.config, 'ssl', null) === null) {
+                this.integration.metadata.config.ssl = true
+            }
+        },
+        async onTestConnection() {
+            this.testConnectionLoading = true
+            let response = { result: false }
+            try {
+                response = await this.testConnection(this.integration.metadata)
+
+                if (response.result) {
+                    this.errorMessage = ''
+                    this.$dialog.success(
+                        this.$t(
+                            'windward.integrations.shared.error.connect_success'
+                        )
+                    )
+                } else {
+                    this.errorMessage = response.message
+                    this.$dialog.error(
+                        this.$t(
+                            'windward.integrations.shared.error.connect_fail'
+                        )
+                    )
+                }
+            } catch (e) {
+                console.error(e)
+                this.$dialog.error(
+                    this.$t('windward.integrations.shared.error.unknown')
+                )
+            }
+
+            // We will indirectly validate the form via connection tests
+            // That way we can 100% confirm that the integration is valid
+            this.formValid = response.result
+            this.testConnectionLoading = false
+        },
+    },
+}
+</script>

package/components/Integration/JobLog.vue

@@ -0,0 +1,281 @@
+<template>
+    <div>
+        <v-btn color="primary" outlined @click="onViewLog()">
+            <v-icon>mdi-note-search</v-icon>
+        </v-btn>
+        <Dialog v-model="logDialog" :trigger="false">
+            <template #title>{{
+                $t(
+                    'windward.integrations.components.integration.job_log.view_log'
+                )
+            }}</template>
+            <template #form="{ on, attrs }">
+                <div v-bind="attrs" v-on="on">
+                    <v-progress-circular
+                        v-if="loading"
+                        size="128"
+                        indeterminate
+                    />
+                    <div v-if="!loading">
+                        <SearchField
+                            v-model="search"
+                            hide-filters
+                        ></SearchField>
+
+                        <v-alert
+                            v-for="logItem in filteredLog"
+                            :key="logItem.id"
+                            :type="logItem.level"
+                            :icon="logItemIcon(logItem)"
+                            class="log-item"
+                        >
+                            <p>{{ logItem.message }}</p>
+                            <div v-if="showDetails(logItem)">
+                                <v-divider class="mt-1 mb-1" />
+                                <p
+                                    v-if="
+                                        logItem.context.remote_content &&
+                                        remoteCourse
+                                    "
+                                >
+                                    {{
+                                        $t(
+                                            'windward.integrations.components.integration.job_log.remote_course_id'
+                                        )
+                                    }}
+                                    {{ remoteCourse.id }}
+                                </p>
+                                <p v-if="logItem.context.remote_content">
+                                    {{
+                                        $t(
+                                            'windward.integrations.components.integration.job_log.remote_content_id'
+                                        )
+                                    }}
+                                    {{ logItem.context.remote_content.id }}
+                                </p>
+                                <p v-if="logItem.context.remote_url">
+                                    {{
+                                        $t(
+                                            'windward.integrations.components.integration.job_log.remote_url'
+                                        )
+                                    }}
+                                    <v-chip
+                                        :href="
+                                            isUrl(logItem.context.remote_url)
+                                                ? logItem.context.remote_url
+                                                : undefined
+                                        "
+                                        label
+                                        target="_blank"
+                                    >
+                                        <span
+                                            class="d-inline-block text-truncate chip-truncate"
+                                        >
+                                            {{ logItem.context.remote_url }}
+                                        </span>
+
+                                        <v-icon
+                                            v-if="
+                                                isUrl(
+                                                    logItem.context.remote_url
+                                                )
+                                            "
+                                            class="ml-2"
+                                        >
+                                            mdi-launch
+                                        </v-icon>
+                                    </v-chip>
+                                </p>
+                                <div v-if="logItem.context.remote_code">
+                                    <p>
+                                        {{
+                                            $t(
+                                                'windward.integrations.components.integration.job_log.remote_code'
+                                            )
+                                        }}
+                                        <v-btn
+                                            icon
+                                            @click="
+                                                onClickCopy(
+                                                    logItem.context.remote_code
+                                                )
+                                            "
+                                            ><v-icon class="ml-2">
+                                                mdi-content-copy
+                                            </v-icon>
+                                            <span class="sr-only">{{
+                                                $t('shared.forms.copy')
+                                            }}</span>
+                                        </v-btn>
+                                    </p>
+                                    <div class="remote-code grey darken-3">
+                                        <code
+                                            class="grey darken-3"
+                                            v-text="logItem.context.remote_code"
+                                        ></code>
+                                    </div>
+                                </div>
+                            </div>
+                        </v-alert>
+
+                        <p v-if="filteredLog.length === 0">
+                            {{
+                                $t(
+                                    'windward.integrations.components.integration.job_log.no_results'
+                                )
+                            }}
+                        </p>
+                    </div>
+                </div>
+            </template>
+        </Dialog>
+    </div>
+</template>
+
+<script>
+import _ from 'lodash'
+import { mapGetters } from 'vuex'
+import SearchField from '~/components/SearchField.vue'
+import Organization from '../../models/Organization'
+
+export default {
+    name: 'IntegrationJobLog',
+    components: { SearchField },
+    props: {
+        id: { type: String, required: true },
+    },
+    data() {
+        return {
+            search: {},
+            loading: true,
+            job: {},
+            log: [],
+            logDialog: false,
+        }
+    },
+    computed: {
+        ...mapGetters({
+            organization: 'organization/get',
+        }),
+        filteredLog() {
+            if (!this.search.term || this.search.term.length < 3) {
+                return this.job.log || []
+            }
+            const filtered = this.job.log.filter((item) => {
+                let match = item.message
+                    .toLowerCase()
+                    .includes(this.search.term.toLowerCase())
+
+                // Search the remote course id
+                if (!match && _.get(item, 'context.remote_course.id', null)) {
+                    match = _.get(item, 'context.remote_course.id', '')
+                        .toString()
+                        .toLowerCase()
+                        .includes(this.search.term.toLowerCase())
+                }
+
+                // Search the remote assessment id
+                if (
+                    !match &&
+                    _.get(item, 'context.remote_assessment.id', null)
+                ) {
+                    match = _.get(item, 'context.remote_assessment.id', '')
+                        .toString()
+                        .toLowerCase()
+                        .includes(this.search.term.toLowerCase())
+                }
+
+                // Search the remote url
+                if (!match && item.context.remote_url) {
+                    match = item.context.remote_url
+                        .toLowerCase()
+                        .includes(this.search.term.toLowerCase())
+                }
+
+                // Search the remote code
+                if (!match && item.context.remote_code) {
+                    match = item.context.remote_code
+                        .toLowerCase()
+                        .includes(this.search.term.toLowerCase())
+                }
+
+                return match
+            })
+
+            return filtered
+        },
+        remoteCourse() {
+            return _.get(this.job, 'metadata.import.remote_course', {})
+        },
+        localCourse() {
+            return _.get(this.job, 'metadata.import.local_course', {})
+        },
+        showDetails() {
+            return (item) => {
+                return (
+                    (Array.isArray(item.context) && item.context.length > 0) ||
+                    !_.isEmpty(item.context)
+                )
+            }
+        },
+        logItemIcon() {
+            return (logItem) => {
+                const type = _.get(logItem, 'context.type', null)
+                if (type === 'missing_file') {
+                    return 'mdi-file-alert'
+                } else if (type === 'converted_file') {
+                    return 'mdi-file-arrow-left-right'
+                }
+
+                return undefined
+            }
+        },
+        isUrl() {
+            return (url) => {
+                return /https?:\/\//.test(url)
+            }
+        },
+    },
+    methods: {
+        async onViewLog() {
+            this.logDialog = true
+            this.job = {}
+
+            const job = await new Organization({
+                id: this.organization.id,
+            })
+                .integrationJobs()
+                .with('log')
+                .find(this.id)
+
+            this.job = job
+            this.loading = false
+        },
+        onClickCopy(data) {
+            navigator.clipboard.writeText(data)
+            this.$dialog.show(this.$t('shared.file.copied'))
+        },
+    },
+}
+</script>
+
+<style scoped>
+.col-progress {
+    min-width: 200px;
+}
+.col-details {
+    max-width: 100px;
+}
+.chip-truncate {
+    max-width: 40vw;
+    direction: rtl;
+}
+.log-item p {
+    margin-bottom: 0px;
+}
+.remote-code {
+    background: inherit;
+    max-width: 40vw;
+    padding: 4px;
+}
+</style>

package/components/Integration/JobTable.vue

@@ -42,7 +42,14 @@
                         <th class="text-left">
                             {{
                                 $t(
-                                    'windward.integrations.components.integration.job.created'
+                                    'windward.integrations.components.integration.job.started'
+                                )
+                            }}
+                        </th>
+                        <th class="text-left">
+                            {{
+                                $t(
+                                    'windward.integrations.components.integration.job_log.view_log'
                                 )
                             }}
                         </th>
@@ -119,6 +126,9 @@
                             {{ jobDetails(item) }}
                         </td>
                         <td>{{ $d(new Date(item.created_at), 'long') }}</td>
+                        <td>
+                            <JobLog :id="item.id"></JobLog>
+                        </td>
                     </tr>
                 </tbody>
             </template>
@@ -132,9 +142,11 @@ import _ from 'lodash'
 import { mapGetters } from 'vuex'
 import Vendor from '../../models/Vendor'
 import Organization from '../../models/Organization'
+import JobLog from './JobLog.vue'
 
 export default {
     name: 'IntegrationJobs',
+    components: { JobLog },
     props: {
         channel: { type: String, required: true },
         event: { type: String, required: true },
@@ -145,6 +157,8 @@ export default {
             vendors: [],
             orgIntegrations: [],
             jobs: [],
+            log: [],
+            logDialog: false,
         }
     },
     async fetch() {

package/components/SecretField.vue

@@ -6,6 +6,7 @@
             </v-btn>
             <v-btn v-if="copy" icon @click="copyText(value)">
                 <v-icon>mdi-content-copy</v-icon>
+                <span class="sr-only">{{ $t('shared.forms.copy') }}</span>
             </v-btn>
         </template>
     </v-text-field>

package/config/integration.config.js

@@ -4,6 +4,7 @@ import Canvas from '../helpers/Driver/Canvas'
 import Desire2Learn from '../helpers/Driver/Desire2Learn'
 import Moodle from '../helpers/Driver/Moodle'
 import GoogleClassroom from '../helpers/Driver/GoogleClassroom'
+import Resourcespace from '../helpers/Driver/Resourcespace'
 
 export default {
     /**
@@ -20,5 +21,6 @@ export default {
         desire2learn: { driver: Desire2Learn },
         moodle: { driver: Moodle },
         google_classroom: { driver: GoogleClassroom },
+        resourcespace: { driver: Resourcespace },
     },
 }

package/helpers/Driver/Resourcespace.ts

@@ -0,0 +1,15 @@
+// @ts-ignore
+import Manage from '../../components/Integration/Driver/ManageResourcespace.vue'
+import DriverInterface, { IntegrationComponents } from './DriverInterface'
+import BaseDriver from './BaseDriver'
+
+export default class Resourcespace
+    extends BaseDriver
+    implements DriverInterface
+{
+    public components(): IntegrationComponents {
+        return {
+            Manage,
+        }
+    }
+}

package/i18n/en-US/components/external_integration/driver/lti1p3.ts

@@ -0,0 +1,13 @@
+export default {
+    key: 'Key',
+    tool_public_keyset_url: 'Tool Keyset Url',
+    tool_oidc_auth_endpoint: 'Tool OpenID Connect Endpoint',
+    platform_public_keyset_url: 'Platform Keyset Url',
+    platform_oidc_auth_endpoint: 'Platform OpenID Connect Endpoint',
+    platform_client_id: 'Platform Client ID',
+    platform_deployment_id: 'Platform Deployment ID',
+    parameter_name: 'Custom Parameter Name',
+    value: 'Value',
+    new: 'New LTI Link',
+    edit: 'Edit LTI Link',
+}

package/i18n/en-US/components/external_integration/index.ts

@@ -1,7 +1,8 @@
 import lti1p1 from './driver/lti1p1'
+import lti1p3 from './driver/lti1p3'
 import providerTarget from './provider_target'
 export default {
-    driver: { lti1p1 },
+    driver: { lti1p1, lti1p3 },
     provider_target: providerTarget,
 
     provider_panel_title: 'Provider (Students incoming to Windward)',

package/i18n/en-US/components/file_import/index.ts

@@ -0,0 +1,5 @@
+import resourcespace from './resourcespace'
+
+export default {
+    resourcespace,
+}

package/i18n/en-US/components/file_import/resourcespace.ts

@@ -0,0 +1,4 @@
+export default {
+    resource_id: 'Resource Id',
+    load_error: 'Failed to connect to Resourcespace',
+}

package/i18n/en-US/components/index.ts

@@ -3,6 +3,7 @@ import settings from './settings'
 import navigation from './navigation'
 import integration from './integration'
 import externalIntegration from './external_integration'
+import fileImport from './file_import'
 
 export default {
     content,
@@ -10,4 +11,5 @@ export default {
     navigation,
     integration,
     external_integration: externalIntegration,
+    file_import: fileImport,
 }

package/i18n/en-US/components/integration/driver.ts

@@ -8,6 +8,7 @@ export default {
         aws_secure_url: 'AWS CDN Url',
         aws_secure_url_hint: 'Eg: https://cdn-d.mindedgecollege.com',
     },
+    remove_slash: 'Remove / at end of url',
     atutor_wgu: {
         manage_dialog_title: 'Manage ATutor WGU Integration',
     },
@@ -26,6 +27,13 @@ export default {
     google_classroom: {
         manage_dialog_title: 'Manage Google Classroom Integration',
     },
+    resourcespace: {
+        manage_dialog_title: 'Manage Resourcespace Integration',
+        url: 'Resourcespace Url',
+        url_hint: 'Eg: https://resourcespace.mindedgeuniversity.com',
+        username: 'Username',
+        key: 'API Key',
+    },
     enabled: 'Integration Enabled',
     disabled: 'Integration Disabled',
     ssl_enabled: 'SSL Enabled (Should be enabled for production)',

package/i18n/en-US/components/integration/index.ts

@@ -1,7 +1,9 @@
 import driver from './driver'
 import job from './job'
+import jobLog from './job_log'
 
 export default {
     driver,
     job,
+    job_log: jobLog,
 }