Unverified Commit 3d17a84a authored by Alberto Nale's avatar Alberto Nale Committed by GitHub
Browse files

[KNOWAGE-7105][KNOWAGE-7112][KNOWAGE-7113]

Possible bugfix:
KNOWAGE-7105

Bugfixes:
KNOWAGE-7112
KNOWAGE-7113
parents c14e0eef 04b19303
......@@ -11,7 +11,7 @@
</Toolbar>
<div class="p-fluid kn-parameter-sidebar-content kn-alternated-rows">
<div class="p-field p-my-1 p-p-2" v-if="user && (!sessionRole || sessionRole === 'No default role selected')">
<div class="p-field p-my-1 p-p-2" v-if="user && (!sessionRole || sessionRole === this.$t('role.defaultRolePlaceholder'))">
<div class="p-d-flex">
<label class="kn-material-input-label">{{ $t('common.roles') }}</label>
</div>
......
......@@ -79,7 +79,7 @@ export default defineComponent({
let id = this.$router.currentRoute.value.params.id ?? this.parseSelectedMenuItem()
if (id && id !== '/document-browser' && (this.$router.currentRoute.value.name === 'document-browser-document-execution' || this.$router.currentRoute.value.name === 'document-browser-document-details-edit' || this.$router.currentRoute.value.name === 'document-browser')) {
if (id && id !== 'document-browser' && (this.$router.currentRoute.value.name === 'document-browser-document-execution' || this.$router.currentRoute.value.name === 'document-browser-document-details-edit' || this.$router.currentRoute.value.name === 'document-browser')) {
let tempDocument = {} as any
await this.$http.get(process.env.VUE_APP_RESTFUL_SERVICES_PATH + `2.0/documents/${id}`).then((response: AxiosResponse<any>) => (tempDocument = response.data))
const tempItem = {
......
......@@ -182,7 +182,7 @@ export default defineComponent({
},
computed: {
sessionRole(): string {
return this.user.sessionRole !== 'No default role selected' ? this.user.sessionRole : null
return this.user.sessionRole !== this.$t('role.defaultRolePlaceholder') ? this.user.sessionRole : null
},
url(): string {
if (this.document) {
......@@ -215,7 +215,7 @@ export default defineComponent({
})
this.user = (this.$store.state as any).user
this.userRole = this.user.sessionRole !== 'No default role selected' ? this.user.sessionRole : null
this.userRole = this.user.sessionRole !== this.$t('role.defaultRolePlaceholder') ? this.user.sessionRole : null
if (this.propMode !== 'document-execution' && !this.$route.path.includes('olap-designer') && this.$route.name !== 'document-execution') return
......
......@@ -11,6 +11,7 @@
<Checkbox v-else-if="column.field === 'decrypt'" v-model="columnsDecrypt[slotProps.data.uniqueName]" :binary="true" @change="onChange(slotProps.data, 'decrypt')"></Checkbox>
<Checkbox v-else-if="column.field === 'subjectId'" v-model="columnsSubjectId[slotProps.data.uniqueName]" :binary="true" @change="onChange(slotProps.data, 'subjectId')"></Checkbox>
<Dropdown v-else-if="column.field === 'type'" class="kn-material-input" v-model="columnsType[slotProps.data.uniqueName]" :options="metawebAttributesTabDescriptor.typeOptions" @change="onChange(slotProps.data, 'type')" />
<InputText v-else-if="column.field === 'name'" v-model="slotProps.data[slotProps.column.props.field]" class="kn-material-input p-inputtext-sm p-p-2" @blur="$emit('metaUpdated')" />
<span v-else>{{ slotProps.data[slotProps.column.props.field] }}</span>
</div>
</template>
......
<template>
<Accordion v-if="businessModel" :multiple="true" :activeIndex="[0]">
<Accordion v-if="businessModel" :multiple="true" :activeIndex="[0, 1]">
<AccordionTab>
<template #header>
<span>{{ $t('metaweb.physicalModel.misc') }}</span>
......
......@@ -283,7 +283,7 @@ export default defineComponent({
async created() {
this.uniqueID = crypto.randomBytes(16).toString('hex')
this.user = (this.$store.state as any).user
this.userRole = this.user.sessionRole !== 'No default role selected' ? this.user.sessionRole : null
this.userRole = this.user.sessionRole && this.user.sessionRole !== this.$t('role.defaultRolePlaceholder') ? this.user.sessionRole : null
await this.loadPage()
},
methods: {
......
......@@ -105,24 +105,24 @@
<WorkspaceNewFolderDialog :visible="displayCreateFolderDialog" @close="displayCreateFolderDialog = false" @create="createNewFolder"></WorkspaceNewFolderDialog>
</template>
<script lang="ts">
import { defineComponent } from 'vue'
import { IDocument, IFolder } from '@/modules/workspace/Workspace'
import { AxiosResponse } from 'axios'
import Sidebar from 'primevue/sidebar'
import Accordion from 'primevue/accordion'
import AccordionTab from 'primevue/accordiontab'
import Listbox from 'primevue/listbox'
import WorkspaceDocumentTree from './genericComponents/WorkspaceDocumentTree.vue'
import workspaceDescriptor from './WorkspaceDescriptor.json'
import WorkspaceNewFolderDialog from './views/repositoryView/dialogs/WorkspaceNewFolderDialog.vue'
import Dialog from 'primevue/dialog'
import KnParameterSidebar from '@/components/UI/KnParameterSidebar/KnParameterSidebar.vue'
import moment from 'moment'
import { mapState } from 'vuex'
import { defineComponent } from 'vue'
import { IDocument, IFolder } from '@/modules/workspace/Workspace'
import { AxiosResponse } from 'axios'
import Sidebar from 'primevue/sidebar'
import Accordion from 'primevue/accordion'
import AccordionTab from 'primevue/accordiontab'
import Listbox from 'primevue/listbox'
import WorkspaceDocumentTree from './genericComponents/WorkspaceDocumentTree.vue'
import workspaceDescriptor from './WorkspaceDescriptor.json'
import WorkspaceNewFolderDialog from './views/repositoryView/dialogs/WorkspaceNewFolderDialog.vue'
import Dialog from 'primevue/dialog'
import KnParameterSidebar from '@/components/UI/KnParameterSidebar/KnParameterSidebar.vue'
import moment from 'moment'
import { mapState } from 'vuex'
const crypto = require('crypto')
const crypto = require('crypto')
export default defineComponent({
export default defineComponent({
name: 'dataset-management',
components: { Sidebar, Listbox, Accordion, AccordionTab, WorkspaceDocumentTree, WorkspaceNewFolderDialog, Dialog, KnParameterSidebar },
computed: {
......@@ -137,7 +137,7 @@
return this.user.functionalities.length > 0
},
userRole(): any {
return this.user.sessionRole !== 'No default role selected' ? this.user.sessionRole : null
return this.user.sessionRole !== this.$t('role.defaultRolePlaceholder') ? this.user.sessionRole : null
}
},
data() {
......@@ -446,16 +446,16 @@
iframe.contentWindow.postMessage('saveDS', '*')
}
}
})
})
</script>
<style scoped lang="scss">
#sideMenu {
#sideMenu {
width: 33.3333%;
}
.custom-kn-page-width {
}
.custom-kn-page-width {
width: calc(100vw - var(--kn-mainmenu-width));
}
@media screen and (max-width: 1024px) {
}
@media screen and (max-width: 1024px) {
#sideMenu {
-webkit-transition: width 0.3s;
transition: width 0.3s;
......@@ -467,41 +467,41 @@
#showSidenavIcon {
display: inline;
}
}
}
</style>
<style lang="scss">
.mySidebar .p-listbox-list li:nth-child(2),
.mySidebar.p-sidebar .p-sidebar-header,
.mySidebar.p-sidebar .p-sidebar-content,
.menu-accordion .p-accordion-content,
.menu-accordion .p-tree,
.menu-accordion-sidebar .p-accordion-content,
.menu-accordion-sidebar .p-tree {
.mySidebar .p-listbox-list li:nth-child(2),
.mySidebar.p-sidebar .p-sidebar-header,
.mySidebar.p-sidebar .p-sidebar-content,
.menu-accordion .p-accordion-content,
.menu-accordion .p-tree,
.menu-accordion-sidebar .p-accordion-content,
.menu-accordion-sidebar .p-tree {
padding: 0 !important;
}
.menu-accordion-sidebar .p-accordion-header {
}
.menu-accordion-sidebar .p-accordion-header {
margin: -7px !important;
}
.menu-accordion .p-accordion-tab-active {
}
.menu-accordion .p-accordion-tab-active {
margin: 0 !important;
padding: 0 !important;
}
.menu-accordion .p-accordion-header-link {
}
.menu-accordion .p-accordion-header-link {
padding: 0.75rem 0.75rem !important;
border-bottom: 1px solid #f2f2f2 !important;
}
.menu-accordion .p-accordion-toggle-icon {
}
.menu-accordion .p-accordion-toggle-icon {
display: none;
}
.menu-accordion-icon {
}
.menu-accordion-icon {
margin-left: auto;
}
.menu-accordion-sidebar .p-accordion-tab-active {
}
.menu-accordion-sidebar .p-accordion-tab-active {
margin: 0 !important;
}
}
@media screen and (min-width: 1025px) {
@media screen and (min-width: 1025px) {
#sideMenu {
-webkit-transition: width 0.3s;
transition: width 0.3s;
......@@ -510,18 +510,18 @@
#showSidenavIcon {
display: none;
}
}
}
.metaweb-dialog.p-dialog {
.metaweb-dialog.p-dialog {
max-height: 100%;
height: 100vh;
width: calc(100vw - var(--kn-mainmenu-width));
margin: 0;
}
.remove-padding.p-dialog .p-dialog-header,
.remove-padding.p-dialog .p-dialog-content {
}
.remove-padding.p-dialog .p-dialog-header,
.remove-padding.p-dialog .p-dialog-content {
padding: 0;
margin: 0;
overflow-x: hidden;
}
}
</style>
......@@ -26,16 +26,16 @@
</template>
<script lang="ts">
import { defineComponent } from 'vue'
import { AxiosResponse } from 'axios'
import Dialog from 'primevue/dialog'
import DatasetPreviewTable from '../tables/DatasetPreviewTable.vue'
import Message from 'primevue/message'
import mainDescriptor from '@/modules/workspace/WorkspaceDescriptor.json'
import workspaceDataPreviewDialogDescriptor from './WorkspaceDataPreviewDialogDescriptor.json'
import KnParameterSidebar from '@/components/UI/KnParameterSidebar/KnParameterSidebar.vue'
import moment from 'moment'
export default defineComponent({
import { defineComponent } from 'vue'
import { AxiosResponse } from 'axios'
import Dialog from 'primevue/dialog'
import DatasetPreviewTable from '../tables/DatasetPreviewTable.vue'
import Message from 'primevue/message'
import mainDescriptor from '@/modules/workspace/WorkspaceDescriptor.json'
import workspaceDataPreviewDialogDescriptor from './WorkspaceDataPreviewDialogDescriptor.json'
import KnParameterSidebar from '@/components/UI/KnParameterSidebar/KnParameterSidebar.vue'
import moment from 'moment'
export default defineComponent({
name: 'kpi-scheduler-save-dialog',
components: { Dialog, DatasetPreviewTable, Message, KnParameterSidebar },
props: { visible: { type: Boolean }, propDataset: { type: Object }, previewType: String, loadFromDatasetManagement: Boolean },
......@@ -94,7 +94,7 @@
}
},
async created() {
this.userRole = (this.$store.state as any).user.sessionRole !== 'No default role selected' ? (this.$store.state as any).user.sessionRole : null
this.userRole = (this.$store.state as any).user.sessionRole !== this.$t('role.defaultRolePlaceholder') ? (this.$store.state as any).user.sessionRole : null
await this.loadPreview()
this.setSidebarMode()
},
......@@ -267,17 +267,17 @@
this.sidebarMode = this.loadFromDatasetManagement ? 'datasetManagement' : 'workspaceView'
}
}
})
})
</script>
<style lang="scss">
.workspace-full-screen-dialog.p-dialog {
.workspace-full-screen-dialog.p-dialog {
max-height: 100%;
}
.workspace-full-screen-dialog .p-dialog .p-dialog-content {
}
.workspace-full-screen-dialog .p-dialog .p-dialog-content {
padding: 0;
}
.workspace-scrollable-table {
}
.workspace-scrollable-table {
height: 100%;
.p-datatable-wrapper {
position: relative;
......@@ -288,12 +288,12 @@
.p-datatable {
max-width: 96vw;
}
}
}
.workspace-parameter-sidebar {
.workspace-parameter-sidebar {
top: 35px !important;
}
.workspace-parameter-sidebar .kn-parameter-sidebar-buttons {
}
.workspace-parameter-sidebar .kn-parameter-sidebar-buttons {
margin-bottom: 45px !important;
}
}
</style>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment