From c7c4950b9245afc9fadca614f796a906374fba43 Mon Sep 17 00:00:00 2001 From: LeireA Date: Wed, 16 Mar 2022 11:02:57 +0100 Subject: [PATCH 01/24] show workspace in dataset table --- frontend/components/core/ReTableInfo.vue | 9 ++++++--- frontend/pages/ws/_workspace/index.vue | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/frontend/components/core/ReTableInfo.vue b/frontend/components/core/ReTableInfo.vue index fa14679455..4844f65974 100644 --- a/frontend/components/core/ReTableInfo.vue +++ b/frontend/components/core/ReTableInfo.vue @@ -494,9 +494,12 @@ export default { &:nth-last-of-type(3) { max-width: 180px; } - &:nth-of-type(2) { - min-width: 30%; - } + // &:nth-of-type(2) { + // min-width: 30%; + // } + // .task span { + // display: flex; + // } &:first-child { flex-shrink: 0; min-width: 220px; diff --git a/frontend/pages/ws/_workspace/index.vue b/frontend/pages/ws/_workspace/index.vue index ea5a92b273..07f7592873 100644 --- a/frontend/pages/ws/_workspace/index.vue +++ b/frontend/pages/ws/_workspace/index.vue @@ -69,6 +69,7 @@ export default { querySearch: undefined, tableColumns: [ { name: "Name", field: "name", class: "table-info__title", type: "link" }, + { name: "Workspace", field: "owner", class: "text", type: "text" }, { name: "Tags", field: "tags", class: "text", type: "object" }, { name: "Task", field: "task", class: "task", type: "task" }, { name: "Created at", field: "created_at", class: "date", type: "date" }, From 1697c0da7e65b0e24d7e080104cab5c5cda68415 Mon Sep 17 00:00:00 2001 From: LeireA Date: Thu, 17 Mar 2022 10:23:00 +0100 Subject: [PATCH 02/24] new user dropdown --- frontend/assets/icons/docs.js | 27 ++++ frontend/assets/icons/index.js | 18 +-- frontend/assets/icons/logout.js | 8 +- .../components/commons/header/user/user.vue | 131 ++++-------------- frontend/static/icons/docs.svg | 13 ++ frontend/static/icons/logout.svg | 16 +-- 6 files changed, 82 insertions(+), 131 deletions(-) create mode 100644 frontend/assets/icons/docs.js create mode 100644 frontend/static/icons/docs.svg diff --git a/frontend/assets/icons/docs.js b/frontend/assets/icons/docs.js new file mode 100644 index 0000000000..4145af4ad9 --- /dev/null +++ b/frontend/assets/icons/docs.js @@ -0,0 +1,27 @@ +/* + * coding=utf-8 + * Copyright 2021-present, the Recognai S.L. team. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* eslint-disable */ +var icon = require('vue-svgicon') +icon.register({ + 'docs': { + width: 12, + height: 16, + viewBox: '0 0 12 16', + data: '' + } +}) \ No newline at end of file diff --git a/frontend/assets/icons/index.js b/frontend/assets/icons/index.js index a2edd67811..58d8f9dc6a 100644 --- a/frontend/assets/icons/index.js +++ b/frontend/assets/icons/index.js @@ -1,20 +1,3 @@ -/* - * coding=utf-8 - * Copyright 2021-present, the Recognai S.L. team. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - /* eslint-disable */ require('./annotate-view') require('./arrow-bottom') @@ -41,6 +24,7 @@ require('./datasets-empty') require('./datasource') require('./datasources') require('./delete') +require('./docs') require('./double-chev') require('./drop-down') require('./drop-up') diff --git a/frontend/assets/icons/logout.js b/frontend/assets/icons/logout.js index a794741ee7..e8295806af 100644 --- a/frontend/assets/icons/logout.js +++ b/frontend/assets/icons/logout.js @@ -19,9 +19,9 @@ var icon = require('vue-svgicon') icon.register({ 'logout': { - width: 17, - height: 22, - viewBox: '0 0 17 22', - data: '' + width: 12, + height: 15, + viewBox: '0 0 12 15', + data: '' } }) \ No newline at end of file diff --git a/frontend/components/commons/header/user/user.vue b/frontend/components/commons/header/user/user.vue index 73bfe0d172..4742dbe65f 100644 --- a/frontend/components/commons/header/user/user.vue +++ b/frontend/components/commons/header/user/user.vue @@ -1,51 +1,19 @@ @@ -28,14 +28,11 @@ export default { }, methods: { - generateCodeSnippet(ws) { + generateCodeSnippet() { return `import rubrix as rb -# If you are using the default installation you can skip this line -rb.set_workspace("${ws}") - rb.log( - rb.TextClassificationRecord(inputs="my first rubrix example"), + rb.TextClassificationRecord(text="my first rubrix example"), name='example-dataset' )`; }, From 4d7018a343a988cee0b58aa62277f10fc32b32bf Mon Sep 17 00:00:00 2001 From: LeireA Date: Thu, 24 Mar 2022 12:37:35 +0100 Subject: [PATCH 18/24] show workspace in url --- frontend/components/core/table/ReTableInfo.vue | 6 +++++- frontend/pages/datasets/_workspace/_dataset/index.vue | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/frontend/components/core/table/ReTableInfo.vue b/frontend/components/core/table/ReTableInfo.vue index dff540abd3..b5fe77da5c 100644 --- a/frontend/components/core/table/ReTableInfo.vue +++ b/frontend/components/core/table/ReTableInfo.vue @@ -233,6 +233,7 @@