diff --git a/dbrepo-analyse-service/Pipfile.lock b/dbrepo-analyse-service/Pipfile.lock index 04e43bc573ecbdd0e6734d12ecab71042530b06a..3d7be35d24b3ac2f3436a2db26a971cb4495522f 100644 --- a/dbrepo-analyse-service/Pipfile.lock +++ b/dbrepo-analyse-service/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "5fbd87c094d93565d64444fc1734d9183e7095d47447d30d6493dfc6bb7e8201" + "sha256": "9cc4c161729b642069bbf4ab379c0f4a9122035afcb3ac7b5b1bfc13281f76aa" }, "pipfile-spec": 6, "requires": { @@ -175,20 +175,20 @@ }, "boto3": { "hashes": [ - "sha256:6d473f0f340d02b4e9ad5b8e68786a09728101a8b950231b89ebdaf72b6dca21", - "sha256:b36feae061dc0793cf311468956a0a9e99215ce38bc99a1a4e55a5b105f16297" + "sha256:ab501f75557863e2d2c9fa731e4fe25c45f35e0d92ea0ee11a4eaa63929d3ede", + "sha256:ae98634efa7b47ced1b0d7342e2940b32639eee913f33ab406590b8ed55ee94b" ], "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==1.36.6" + "version": "==1.36.7" }, "botocore": { "hashes": [ - "sha256:4864c53d638da191a34daf3ede3ff1371a3719d952cc0c6bd24ce2836a38dd77", - "sha256:f77bbbb03fb420e260174650fb5c0cc142ec20a96967734eed2b0ef24334ef34" + "sha256:9abc64bde5e7d8f814ea91d6fc0a8142511fc96427c19fe9209677c20a0c9e6e", + "sha256:a6c6772d777af2957ac9975207fac1ccc4ce101408b85e9b5e3c5ba0bb949102" ], "markers": "python_version >= '3.8'", - "version": "==1.36.6" + "version": "==1.36.7" }, "certifi": { "hashes": [ @@ -412,7 +412,7 @@ }, "dbrepo": { "hashes": [ - "sha256:181e3da705d8f61ef26a743e0a445c5363b68c671c63f655791d340efdd7aac0" + "sha256:5626cbba65f39a016c0eeff905005dd10b854f47edc09de293c62b164d65635a" ], "path": "./lib/dbrepo-1.6.3.tar.gz" }, diff --git a/dbrepo-analyse-service/lib/dbrepo-1.6.3-py3-none-any.whl b/dbrepo-analyse-service/lib/dbrepo-1.6.3-py3-none-any.whl new file mode 100644 index 0000000000000000000000000000000000000000..93e86252f8c62fbbd600ccad15fa4044446d2fe7 Binary files /dev/null and b/dbrepo-analyse-service/lib/dbrepo-1.6.3-py3-none-any.whl differ diff --git a/dbrepo-analyse-service/lib/dbrepo-1.6.3.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.6.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..d11ce1f61e95fc31351dbfdc9abfef9124187f64 Binary files /dev/null and b/dbrepo-analyse-service/lib/dbrepo-1.6.3.tar.gz differ diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java index 36caa7e9f6163913d5dd7fb5fb18ec31114bcf48..1d9bc28c6ac1b5d1a4cc38b6ba53a758dbceea22 100644 --- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java +++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java @@ -534,8 +534,6 @@ public interface MetadataMapper { } default TableDto tableToTableDto(Table data) { - data.getDatabase() - .setTables(null); final TableDto table = TableDto.builder() .id(data.getId()) .name(data.getName()) @@ -548,7 +546,10 @@ public interface MetadataMapper { .description(data.getDescription()) .identifiers(new LinkedList<>()) .columns(new LinkedList<>()) - .database(databaseToDatabaseDto(data.getDatabase())) + .database(databaseToDatabaseDto(data.getDatabase() + .toBuilder() + .tables(null) + .build())) .constraints(constraintsToConstraintsDto(data.getConstraints())) .build(); if (data.getIdentifiers() != null) { diff --git a/dbrepo-search-service/Pipfile.lock b/dbrepo-search-service/Pipfile.lock index ded9023e433ea6654c4630c37e17ff5077b267b6..c76e5a360981bf59cfc3866b46b595f68141363b 100644 --- a/dbrepo-search-service/Pipfile.lock +++ b/dbrepo-search-service/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "729017f537f9f8fb6dcc15703392c7fd79aec494feba4c107e7a1888e8ea955d" + "sha256": "2ff9fc673f1fb1e5dc272aa711f4e730088fa0188b44449db042abf99b6c4db7" }, "pipfile-spec": 6, "requires": { @@ -360,9 +360,9 @@ }, "dbrepo": { "hashes": [ - "sha256:181e3da705d8f61ef26a743e0a445c5363b68c671c63f655791d340efdd7aac0" + "sha256:5626cbba65f39a016c0eeff905005dd10b854f47edc09de293c62b164d65635a" ], - "path": "./lib/dbrepo-1.6.2.tar.gz" + "path": "./lib/dbrepo-1.6.3.tar.gz" }, "docker": { "hashes": [ diff --git a/dbrepo-search-service/init/lib/dbrepo-1.6.3-py3-none-any.whl b/dbrepo-search-service/init/lib/dbrepo-1.6.3-py3-none-any.whl new file mode 100644 index 0000000000000000000000000000000000000000..93e86252f8c62fbbd600ccad15fa4044446d2fe7 Binary files /dev/null and b/dbrepo-search-service/init/lib/dbrepo-1.6.3-py3-none-any.whl differ diff --git a/dbrepo-search-service/init/lib/dbrepo-1.6.3.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.6.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..d11ce1f61e95fc31351dbfdc9abfef9124187f64 Binary files /dev/null and b/dbrepo-search-service/init/lib/dbrepo-1.6.3.tar.gz differ diff --git a/dbrepo-search-service/lib/dbrepo-1.6.3-py3-none-any.whl b/dbrepo-search-service/lib/dbrepo-1.6.3-py3-none-any.whl new file mode 100644 index 0000000000000000000000000000000000000000..93e86252f8c62fbbd600ccad15fa4044446d2fe7 Binary files /dev/null and b/dbrepo-search-service/lib/dbrepo-1.6.3-py3-none-any.whl differ diff --git a/dbrepo-search-service/lib/dbrepo-1.6.3.tar.gz b/dbrepo-search-service/lib/dbrepo-1.6.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..d11ce1f61e95fc31351dbfdc9abfef9124187f64 Binary files /dev/null and b/dbrepo-search-service/lib/dbrepo-1.6.3.tar.gz differ diff --git a/dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue b/dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue index f4007569a21e134abb26f4f5176776ab09da82ce..a9ddd4692924a14c628c3d62a837cebc20afe73c 100644 --- a/dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue +++ b/dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue @@ -219,13 +219,7 @@ </div> </template> -<script setup> -const { refresh, user } = useOidcAuth() -if (user.value?.canRefresh) { - await refresh() -} -</script> -<script> + <script> import TableSchema from '@/components/table/TableSchema.vue' import { notEmpty } from '@/utils' import { useCacheStore } from '@/stores/cache.js'