@windward/integrations 0.2.1 → 0.3.0

package/components/Content/Blocks/ExternalIntegration/LtiConsumer.vue

@@ -154,7 +154,7 @@ import BaseContentBlock from '~/components/Content/Blocks/BaseContentBlock'
 import Course from '~/models/Course'
 import Organization from '~/models/Organization'
 import Enrollment from '~/models/Enrollment'
-import DialogBox from '~/components/DialogBox.vue'
+import DialogBox from '~/components/Core/DialogBox.vue'
 
 export default {
     name: 'ContentBlockExternalIntegrationLti1p1Consumer',
@@ -321,7 +321,8 @@ export default {
         },
         onBeforeSave() {
             // Set a generic body since we don't use this field
-            this.block.body = 'lti-' + this.consumer.version + '-consumer'
+            this.block.body =
+                'lti-' + _.get(this.consumer, 'version', '0.0') + '-consumer'
         },
     },
 }

package/components/ExternalIntegration/Driver/Lti1p1/ManageConsumer.vue

@@ -154,7 +154,7 @@ import LtiConsumer from '../../../../models/ExternalIntegration/LtiConsumer'
 import Organization from '~/models/Organization'
 import Course from '~/models/Course'
 import TextEditor from '~/components/Text/TextEditor.vue'
-import FormVue from '~/components/Form'
+import FormVue from '~/components/Core/Form'
 
 export default {
     name: 'ManageLti1p1ConsumerDriver',

package/components/ExternalIntegration/Driver/Lti1p1/ManageConsumers.vue

@@ -101,8 +101,8 @@ import LtiConsumer from '../../../../models/ExternalIntegration/LtiConsumer'
 import ManageConsumer from './ManageConsumer.vue'
 import Course from '~/models/Course'
 import Organization from '~/models/Organization'
-import DialogBox from '~/components/DialogBox.vue'
-import SpeedDial from '~/components/SpeedDial.vue'
+import DialogBox from '~/components/Core/DialogBox.vue'
+import SpeedDial from '~/components/Core/SpeedDial.vue'
 
 export default {
     name: 'ManageLti1p1ConsumersDriver',

package/components/ExternalIntegration/Driver/Lti1p1/ManageProvider.vue

@@ -256,7 +256,7 @@ import _ from 'lodash'
 import { mapGetters } from 'vuex'
 import ProviderTargetPicker from '../../ProviderTargetPicker.vue'
 import LtiProvider from '../../../../models/ExternalIntegration/LtiProvider'
-import FormVue from '~/components/Form.vue'
+import FormVue from '~/components/Core/Form.vue'
 import Role from '~/models/Role'
 import Organization from '~/models/Organization'
 import Course from '~/models/Course'

package/components/ExternalIntegration/Driver/Lti1p1/ManageProviders.vue

@@ -124,10 +124,10 @@ import LtiProvider from '../../../../models/ExternalIntegration/LtiProvider'
 import SecretField from '../../../SecretField.vue'
 import ProviderTargetViewer from '../../ProviderTargetViewer.vue'
 import ManageProvider from './ManageProvider.vue'
-import DialogBox from '~/components/DialogBox.vue'
+import DialogBox from '~/components/Core/DialogBox.vue'
 import Organization from '~/models/Organization'
 import Course from '~/models/Course'
-import SpeedDial from '~/components/SpeedDial.vue'
+import SpeedDial from '~/components/Core/SpeedDial.vue'
 
 export default {
     name: 'ManageLti1p1ProvidersDriver',

package/components/ExternalIntegration/Driver/Lti1p3/ManageConsumer.vue

@@ -145,7 +145,7 @@ import LtiConsumer from '../../../../models/ExternalIntegration/LtiConsumer'
 import Organization from '~/models/Organization'
 import Course from '~/models/Course'
 import TextEditor from '~/components/Text/TextEditor.vue'
-import FormVue from '~/components/Form'
+import FormVue from '~/components/Core/Form'
 
 export default {
     name: 'ManageLti1p3ConsumerDriver',

package/components/ExternalIntegration/Driver/Lti1p3/ManageConsumers.vue

@@ -128,8 +128,8 @@ import ManageConsumer from './ManageConsumer.vue'
 import ViewConsumer from './ViewConsumer.vue'
 import Course from '~/models/Course'
 import Organization from '~/models/Organization'
-import DialogBox from '~/components/DialogBox.vue'
-import SpeedDial from '~/components/SpeedDial.vue'
+import DialogBox from '~/components/Core/DialogBox.vue'
+import SpeedDial from '~/components/Core/SpeedDial.vue'
 
 export default {
     name: 'ManageLti1p1ConsumersDriver',

package/components/ExternalIntegration/Driver/Lti1p3/ManageProvider.vue

@@ -356,7 +356,7 @@ import { mapGetters } from 'vuex'
 import ProviderTargetPicker from '../../ProviderTargetPicker.vue'
 import LtiProvider from '../../../../models/ExternalIntegration/LtiProvider'
 
-import FormVue from '~/components/Form.vue'
+import FormVue from '~/components/Core/Form.vue'
 import Role from '~/models/Role'
 import Organization from '~/models/Organization'
 import Course from '~/models/Course'

package/components/ExternalIntegration/Driver/Lti1p3/ManageProviders.vue

@@ -126,10 +126,10 @@ import LtiProvider from '../../../../models/ExternalIntegration/LtiProvider'
 import SecretField from '../../../SecretField.vue'
 import ProviderTargetViewer from '../../ProviderTargetViewer.vue'
 import ManageProvider from './ManageProvider.vue'
-import DialogBox from '~/components/DialogBox.vue'
+import DialogBox from '~/components/Core/DialogBox.vue'
 import Organization from '~/models/Organization'
 import Course from '~/models/Course'
-import SpeedDial from '~/components/SpeedDial.vue'
+import SpeedDial from '~/components/Core/SpeedDial.vue'
 
 export default {
     name: 'ManageLti1p1ProvidersDriver',

package/components/ExternalIntegration/Driver/Lti1p3/ViewConsumer.vue

@@ -112,7 +112,7 @@ import LtiConsumer from '../../../../models/ExternalIntegration/LtiConsumer'
 import SecretField from '../../../SecretField.vue'
 import Organization from '~/models/Organization'
 import Course from '~/models/Course'
-import FormVue from '~/components/Form'
+import FormVue from '~/components/Core/Form'
 export default {
     name: 'ViewLti1p3Consumer',
     components: { SecretField },

package/components/FileImport/FileImportMenu.vue

@@ -39,7 +39,7 @@
 import _ from 'lodash'
 import { mapGetters } from 'vuex'
 import Organization from '../../models/Organization'
-import DialogBox from '~/components/DialogBox.vue'
+import DialogBox from '~/components/Core/DialogBox.vue'
 
 export default {
     name: 'FileImportMenu',

package/components/FileImport/Resourcespace.vue

@@ -61,7 +61,7 @@ import { mapGetters } from 'vuex'
 import OrganizationIntegration from '../../models/OrganizationIntegration'
 import RemoteFile from '../../models/RemoteFile'
 import Course from '~/models/Course'
-import SearchField from '~/components/SearchField.vue'
+import SearchField from '~/components/Core/SearchField.vue'
 
 export default {
     name: 'FileImportResourcespace',

package/components/Integration/Driver/ManageBase.vue

@@ -3,7 +3,7 @@ import { mapGetters } from 'vuex'
 import Organization from '../../../models/Organization'
 import OrganizationIntegration from '../../../models/OrganizationIntegration'
 import Vendor from '../../../models/Vendor'
-import FormVue from '~/components/Form'
+import FormVue from '~/components/Core/Form'
 
 export default {
     name: 'ManageBase',

package/components/Integration/JobLog.vue

@@ -187,8 +187,8 @@
 <script>
 import _ from 'lodash'
 import { mapGetters } from 'vuex'
-import SearchField from '~/components/SearchField.vue'
 import Organization from '../../models/Organization'
+import SearchField from '~/components/Core/SearchField.vue'
 
 export default {
     name: 'IntegrationJobLog',

package/components/Integration/JobTable.vue

@@ -156,13 +156,14 @@
 import Confetti from 'canvas-confetti'
 import _ from 'lodash'
 import { mapGetters } from 'vuex'
+import DialogBox from '~/components/Core/DialogBox.vue'
 import Vendor from '../../models/Vendor'
 import Organization from '../../models/Organization'
 import JobLog from './JobLog.vue'
 
 export default {
     name: 'IntegrationJobs',
-    components: { JobLog },
+    components: { DialogBox, JobLog },
     props: {
         channel: { type: String, required: true },
         event: { type: String, required: true },

package/components/Navigation/Items/CourseJobLog.vue

@@ -20,11 +20,12 @@
 <script>
 import _ from 'lodash'
 import { mapGetters } from 'vuex'
+import DialogBox from '~/components/Core/DialogBox.vue'
 import JobLog from '../../Integration/JobLog.vue'
 
 export default {
     name: 'NavigationItemCourseJobLog',
-    components: { JobLog },
+    components: { DialogBox, JobLog },
     props: {
         config: { type: Object, required: true },
     },

package/components/Settings/ExternalIntegration/LtiConsumerSettings.vue

@@ -10,6 +10,7 @@
                     'windward.integrations.components.settings.external_integration.lti_consumer.title'
                 )
             "
+            :disabled="render"
         ></v-text-field>
         <v-textarea
             v-model="block.metadata.config.instructions"
@@ -21,6 +22,7 @@
                     'windward.integrations.components.settings.external_integration.lti_consumer.instructions'
                 )
             "
+            :disabled="render"
         ></v-textarea>
         <br />
         <v-divider class="primary"></v-divider>
@@ -35,6 +37,7 @@
             :items="launchTypes"
             item-text="name"
             item-value="value"
+            :disabled="render"
         ></v-select>
         {{
             $t(
@@ -50,8 +53,8 @@
                     v-for="consumer in consumers"
                     :key="consumer.id"
                     two-line
-                    :disabled="!consumer.enabled"
                     :value="consumer.id"
+                    :disabled="render || !consumer.enabled"
                 >
                     <v-list-item-avatar
                         :color="!consumer.enabled ? 'error' : ''"
@@ -88,7 +91,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import LtiConsumer from '../../../models/ExternalIntegration/LtiConsumer'
-import BaseContentSettings from '~/components/Content/Tool/BaseContentSettings.js'
+import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
 import Course from '~/models/Course'
 import Organization from '~/models/Organization'
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@windward/integrations",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "description": "Windward UI Plugin Integrations for 3rd Party Systems",
     "main": "plugin.js",
     "scripts": {
@@ -21,7 +21,7 @@
     "license": "MIT",
     "homepage": "https://bitbucket.org/mindedge/windward-ui-plugin-integrations#readme",
     "dependencies": {
-        "@windward/core": "^0.0.2",
+        "@windward/core": "^0.3.0",
         "canvas-confetti": "^1.6.0",
         "eslint": "^8.11.0",
         "laravel-echo": "^1.15.0",

package/pages/admin/vendors.vue

@@ -153,8 +153,8 @@ import _ from 'lodash'
 import { mapGetters } from 'vuex'
 import Organization from '../../models/Organization'
 import IntegrationJobTable from '../../components/Integration/JobTable.vue'
-import Breadcrumbs from '~/components/Breadcrumbs.vue'
-import DialogBox from '~/components/DialogBox.vue'
+import Breadcrumbs from '~/components/Core/Breadcrumbs.vue'
+import DialogBox from '~/components/Core/DialogBox.vue'
 
 export default {
     name: 'PluginIntegrationsAdminVendorsPage',

package/test/__mocks__/componentsMock.js

@@ -1,48 +1 @@
-// TODO find better way for jest to recognize utils imports
-jest.mock(
-    '~/components/Form.vue',
-    () => {
-        return {
-            data() {
-                return { validation: {} }
-            },
-        }
-    },
-    { virtual: true }
-)
-
-jest.mock(
-    '~/components/Form',
-    () => {
-        return {
-            data() {
-                return { validation: {} }
-            },
-        }
-    },
-    { virtual: true }
-)
-
-jest.mock(
-    '~/components/Breadcrumbs.vue',
-    () => {
-        return {
-            data() {
-                return { validation: {} }
-            },
-        }
-    },
-    { virtual: true }
-)
-
-jest.mock(
-    '~/components/SearchField.vue',
-    () => {
-        return {
-            props: {},
-            computed: {},
-            methods: {},
-        }
-    },
-    { virtual: true }
-)
+// Mock components from other repos

package/test/__mocks__/modelMock.js

@@ -1,105 +1,22 @@
-import { Model as mockModel } from 'vue-api-query'
+import { registerModels } from '@windward/core/test/__mocks__/modelMock.js'
 
-import axios from 'axios'
-jest.mock('axios')
-mockModel.$http = axios
-
-jest.mock('axios')
-
-// Define any new model mocks here. The imports / mocks will be auto-generated below
-const mockVirtualModels = [
-    { path: '~/models/Role', resource: 'roles' },
-    { path: '~/models/Organization', resource: 'organizations' },
-]
-
-const mockModels = [
-    { path: '../../models/Organization', resource: 'organizations' },
+registerModels([
+    { path: '@/models/Organization', resource: 'organizations' },
     {
-        path: '../../models/OrganizationIntegration',
+        path: '@/models/OrganizationIntegration',
         resource: 'organization-integrations',
     },
     {
-        path: '../../models/CourseSectionIntegration',
+        path: '@/models/CourseSectionIntegration',
         resource: 'section-integrations',
     },
-    { path: '../../models/IntegrationJob', resource: 'integration-jobs' },
-    { path: '../../models/RemoteContent', resource: 'remote-content' },
-    { path: '../../models/RemoteCourse', resource: 'remote-courses' },
+    { path: '@/models/IntegrationJob', resource: 'integration-jobs' },
+    { path: '@/models/RemoteContent', resource: 'remote-content' },
+    { path: '@/models/RemoteCourse', resource: 'remote-courses' },
     {
-        path: '../../models/RemoteOrganization',
+        path: '@/models/RemoteOrganization',
         resource: 'remote-organizations',
     },
-    { path: '../../models/Vendor', resource: 'vendors' },
-    { path: '../../models/RemoteFile', resource: 'remote-files' },
-]
-
-// DO NOT ALTER THE BELOW CODE
-jest.mock('', () => {
-    return {
-        __esModule: true,
-        default: class Model {},
-    }
-})
-class mockBaseModel extends mockModel {
-    baseURL() {
-        return 'http://windwardapi.local'
-    }
-
-    request(_config) {
-        return new Promise((resolve) => {
-            resolve({ data: {} })
-        })
-    }
-}
-
-jest.mock(
-    '~/models/Model',
-    () => {
-        return {
-            __esModule: true,
-            default: class Model extends mockBaseModel {},
-        }
-    },
-    { virtual: true }
-)
-
-for (let mockI = 0; mockI < mockVirtualModels.length; mockI++) {
-    jest.mock(
-        mockVirtualModels[mockI].path,
-        () => {
-            return {
-                __esModule: true,
-                default: class Model extends mockBaseModel {
-                    resource() {
-                        return (
-                            mockVirtualModels[mockI].resource ||
-                            this.constructor.name
-                        )
-                    }
-                },
-            }
-        },
-        { virtual: true }
-    )
-}
-
-for (let mockJ = 0; mockJ < mockModels.length; mockJ++) {
-    jest.mock(mockModels[mockJ].path, () => {
-        return {
-            __esModule: true,
-            default: class Model extends mockBaseModel {
-                resource() {
-                    return mockModels[mockJ].resource || this.constructor.name
-                }
-
-                integrations() {
-                    return this
-                }
-
-                get() {
-                    return []
-                }
-            },
-        }
-    })
-}
+    { path: '@/models/Vendor', resource: 'vendors' },
+    { path: '@/models/RemoteFile', resource: 'remote-files' },
+])