move Sidebar from router.js to Forms.vue

Signed-off-by: GitHub <[email protected]>
Signed-off-by: Christian Hartmann <[email protected]>

src/Forms.vue

@@ -122,12 +122,11 @@
 				:form.sync="selectedForm"
 				:sidebar-opened.sync="sidebarOpened"
 				@open-sharing="openSharing" />
-			<router-view
+			<Sidebar
 				v-if="!selectedForm.partial && canEdit"
 				:form="selectedForm"
 				:sidebar-opened.sync="sidebarOpened"
-				:active.sync="sidebarActive"
-				name="sidebar" />
+				:active.sync="sidebarActive" />
 		</template>
 
 		<!-- Archived forms modal -->
@@ -162,8 +161,9 @@ import IconPlus from 'vue-material-design-icons/Plus.vue'
 import ArchivedFormsModal from './components/ArchivedFormsModal.vue'
 import AppNavigationForm from './components/AppNavigationForm.vue'
 import FormsIcon from './components/Icons/FormsIcon.vue'
-import PermissionTypes from './mixins/PermissionTypes.js'
 import OcsResponse2Data from './utils/OcsResponse2Data.js'
+import PermissionTypes from './mixins/PermissionTypes.js'
+import Sidebar from './views/Sidebar.vue'
 import logger from './utils/Logger.js'
 import { FormState } from './models/FormStates.ts'
 
@@ -184,6 +184,7 @@ export default {
 		NcContent,
 		NcEmptyContent,
 		NcLoadingIcon,
+		Sidebar,
 	},
 
 	mixins: [PermissionTypes],

src/router.js

@@ -9,7 +9,6 @@ import { generateUrl } from '@nextcloud/router'
 
 import Create from './views/Create.vue'
 import Results from './views/Results.vue'
-import Sidebar from './views/Sidebar.vue'
 import Submit from './views/Submit.vue'
 
 Vue.use(Router)
@@ -37,7 +36,6 @@ export default new Router({
 			path: '/:hash/edit',
 			components: {
 				default: Create,
-				sidebar: Sidebar,
 			},
 			name: 'edit',
 			props: { default: true },
@@ -46,7 +44,6 @@ export default new Router({
 			path: '/:hash/results',
 			components: {
 				default: Results,
-				sidebar: Sidebar,
 			},
 			name: 'results',
 			props: { default: true },
@@ -55,7 +52,6 @@ export default new Router({
 			path: '/:hash/submit',
 			components: {
 				default: Submit,
-				sidebar: Sidebar,
 			},
 			name: 'submit',
 			props: { default: true },