Manage your Accounts
+Manage your Databus accounts and access configurations
| User | Uploads | Derived Data |
|---|---|---|
| {{ row.account }} | {{ row.numUploads }} | {{ row.uploadSize }} |
| Group Id | # Artifacts |
|---|---|
| {{ row.label }} | {{ row.artifactCount }} |
| User | Uploads | Derived Data |
|---|---|---|
| {{ row.account }} | {{ row.numUploads }} | {{ row.uploadSize }} |
| Group Id | # Artifacts |
|---|---|
| {{ row.label }} | {{ row.artifactCount }} |
diff --git a/public/js/components/collection-search/collection-search.js b/public/js/components/collection-search/collection-search.js
index 980a611b..ccffc3d2 100644
--- a/public/js/components/collection-search/collection-search.js
+++ b/public/js/components/collection-search/collection-search.js
@@ -48,7 +48,7 @@ function CollectionSearchController(collectionManager, $http, $interval, $sce) {
// TODO Fabian
ctrl.isInCollection = function (result) {
- let uri = result.resource[0].value;
+ let uri = result.id[0].value;
let node = QueryNode.findChildByUri(ctrl.root, uri);
return node != null;
@@ -61,11 +61,11 @@ function CollectionSearchController(collectionManager, $http, $interval, $sce) {
var sourceNode = QueryNode.findChildByUri(ctrl.root, currentSource);
if (result.inCollection) {
- QueryNode.removeChildByUri(ctrl.root, result.resource[0].value);
+ QueryNode.removeChildByUri(ctrl.root, result.id[0].value);
}
else {
if (result.typeName[0].value == 'Group') {
- let node = new QueryNode(result.resource[0].value, 'databus:group');
+ let node = new QueryNode(result.id[0].value, 'databus:group');
sourceNode.addChild(node);
ctrl.onComponentAdded();
@@ -73,7 +73,7 @@ function CollectionSearchController(collectionManager, $http, $interval, $sce) {
if (result.typeName[0].value == 'Artifact') {
- var artifactUri = result.resource[0].value;
+ var artifactUri = result.id[0].value;
let groupUri = DatabusUtils.navigateUp(artifactUri);
let groupNode = QueryNode.findChildByUri(ctrl.root, groupUri);
diff --git a/public/js/components/databus-icon/databus-icon.html b/public/js/components/databus-icon/databus-icon.html
index 36b70c66..1e6f6859 100644
--- a/public/js/components/databus-icon/databus-icon.html
+++ b/public/js/components/databus-icon/databus-icon.html
@@ -1,5 +1,6 @@
\ No newline at end of file
diff --git a/public/js/components/entity-api-view/entity-api-view.js b/public/js/components/entity-api-view/entity-api-view.js
new file mode 100644
index 00000000..67e29fa3
--- /dev/null
+++ b/public/js/components/entity-api-view/entity-api-view.js
@@ -0,0 +1,36 @@
+function EntityApiViewController() {
+ const ctrl = this;
+
+ ctrl.copyToClipboard = function (text) {
+ navigator.clipboard.writeText(text).then(() => {
+ console.log("Copied to clipboard");
+ });
+ };
+
+ ctrl.register = async function () {
+ ctrl.isRegistering = true;
+ ctrl.isSuccess = false;
+ ctrl.isError = false;
+
+ if (ctrl.entity && ctrl.entity.register) {
+ try {
+ let response = await ctrl.entity.register();
+ ctrl.log = response.data.log;
+ ctrl.isSuccess = true;
+ } catch(err) {
+ ctrl.log = err.data.log;
+ ctrl.isError = true;
+ }
+ }
+
+ ctrl.isRegistering = false;
+ };
+
+ ctrl.setApiKeyName = function (name) {
+ if (ctrl.entity && ctrl.entity.setApiKeyName) {
+ ctrl.entity.setApiKeyName(name);
+ }
+ };
+}
+
+module.exports = EntityApiViewController;
diff --git a/public/js/components/entity-card/entity-card.html b/public/js/components/entity-card/entity-card.html
index e07ecef4..0c04e85b 100644
--- a/public/js/components/entity-card/entity-card.html
+++ b/public/js/components/entity-card/entity-card.html
@@ -1,10 +1,10 @@
-
+
diff --git a/public/js/components/entity-dropdown/entity-dropdown.html b/public/js/components/entity-dropdown/entity-dropdown.html
new file mode 100644
index 00000000..1a424987
--- /dev/null
+++ b/public/js/components/entity-dropdown/entity-dropdown.html
@@ -0,0 +1,55 @@
+
diff --git a/public/js/components/nav-search/nav-search-controller.js b/public/js/components/nav-search/nav-search-controller.js
new file mode 100644
index 00000000..afd3e42f
--- /dev/null
+++ b/public/js/components/nav-search/nav-search-controller.js
@@ -0,0 +1,150 @@
+
+
+// hinzufügen eines Controllers zum Modul
+function NavSearchController($http, $interval, $sce, searchManager) {
+
+ var ctrl = this;
+
+ // TODO: get search extensions from the logged in user
+
+ ctrl.searchManager = searchManager;
+ ctrl.results = [];
+
+ ctrl.formatResult = function (result) {
+ return $sce.trustAsHtml(result);
+ }
+
+ ctrl.toggleFilter = function (key) {
+ ctrl.filterActive[key] = !ctrl.filterActive[key];
+ ctrl.search();
+ }
+
+ ctrl.navigateTo = function(uri) {
+ window.location = uri;
+ }
+
+ ctrl.hideDropdown = function() {
+
+ }
+
+ ctrl.availableResourceTypes = ['Collection', 'Artifact', 'Group', 'Account', 'Version' ];
+
+ ctrl.$onInit = function () {
+
+ ctrl.searchInput = '';
+ ctrl.isSearching = false;
+ ctrl.searchCooldown = 1000;
+
+
+ ctrl.filterActive = {};
+ ctrl.filterVisible = {};
+
+
+ if (ctrl.settings == undefined) {
+ ctrl.minRelevance = 0.01;
+ ctrl.maxResults = 50;
+ ctrl.searchFilter = "";
+ ctrl.resourceTypes = null;
+ ctrl.placeholder = "Search the Databus..."
+ } else {
+ ctrl.minRelevance = ctrl.settings.minRelevance;
+ ctrl.maxResults = ctrl.settings.maxResults;
+ ctrl.searchFilter = ctrl.settings.filter;
+ ctrl.resourceTypes = ctrl.settings.resourceTypes;
+ ctrl.placeholder = ctrl.settings.placeholder;
+ }
+
+ for (var resourceType of ctrl.availableResourceTypes) {
+ ctrl.filterActive[resourceType] = false;
+ ctrl.filterVisible[resourceType] = ctrl.resourceTypes == null;
+ }
+
+ ctrl.numFilters = 0;
+
+ if (ctrl.resourceTypes != null) {
+ for (var resourceType of ctrl.resourceTypes) {
+ ctrl.filterVisible[resourceType] = true;
+ ctrl.numFilters++;
+ }
+ }
+ }
+
+ ctrl.isAnyFilterActive = function () {
+
+ for (var resourceType of ctrl.availableResourceTypes) {
+
+ if (!ctrl.filterVisible[resourceType]) {
+ continue;
+ }
+
+ if (ctrl.filterActive[resourceType]) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ ctrl.baseQueryFormatter = function(query) {
+ return `?query=${query}${ctrl.searchFilter}${ctrl.baseFilters}${ctrl.typeFilters}`
+ }
+
+ $interval(function () {
+
+ if (ctrl.searchChanged) {
+
+ var baseFilters = `&minRelevance=${ctrl.minRelevance}&maxResults=${ctrl.maxResults}`;
+ var typeFilters = ``;
+ var isAnyFilterActive = ctrl.isAnyFilterActive();
+
+
+ for (var resourceType of ctrl.availableResourceTypes) {
+
+ if (!ctrl.filterVisible[resourceType]) {
+ continue;
+ }
+
+ if (ctrl.filterActive[resourceType] || !isAnyFilterActive) {
+
+ if (typeFilters == ``) {
+ typeFilters = `&typeName=`;
+ }
+
+ typeFilters += ` ${resourceType}`;
+ }
+ }
+
+ ctrl.baseFilters = baseFilters;
+ ctrl.typeFilters = typeFilters;
+ ctrl.searchManager.baseAdapter.queryFormatter = ctrl.baseQueryFormatter;
+
+ ctrl.searchManager.search(ctrl.searchInput).then(function success(results) {
+
+ for(var result of results) {
+
+ if(result.abstract != null) {
+ result.abstract = result.abstract[result.abstract.length - 1];
+ }
+ }
+
+ ctrl.results = results;
+
+
+ ctrl.isSearching = false;
+ }, function error(response) {
+ ctrl.isSearching = false;
+ });
+
+ ctrl.searchChanged = false;
+ };
+ }, ctrl.searchCooldown);
+
+ ctrl.search = function () {
+ ctrl.isSearching = true;
+ ctrl.searchChanged = true;
+ };
+
+};
+
+module.exports = NavSearchController;
+
diff --git a/public/js/components/nav-search/nav-search.html b/public/js/components/nav-search/nav-search.html
new file mode 100644
index 00000000..8350d3f5
--- /dev/null
+++ b/public/js/components/nav-search/nav-search.html
@@ -0,0 +1,80 @@
+
+
+
diff --git a/public/js/components/entity-dropdown/entity-dropdown.js b/public/js/components/entity-dropdown/entity-dropdown.js
new file mode 100644
index 00000000..37bd0332
--- /dev/null
+++ b/public/js/components/entity-dropdown/entity-dropdown.js
@@ -0,0 +1,74 @@
+function EntityDropdownController() {
+ var ctrl = this;
+
+ ctrl.showDrop = false;
+ ctrl.selectedLabel = '';
+ ctrl.searchQuery = '';
+ ctrl.filteredItems = [];
+
+ ctrl.$onInit = function () {
+ ctrl.updateFilteredItems();
+ ctrl.setSelectedLabel();
+ };
+
+ ctrl.$onChanges = function (changes) {
+ if (changes.items || changes.selected) {
+ ctrl.updateFilteredItems();
+
+ if (ctrl.selected && Array.isArray(ctrl.items) && !ctrl.items?.some(i => i[ctrl.displayProperty] === ctrl.selected)) {
+ ctrl.selected = null;
+ ctrl.onSelect({ item: null });
+ }
+
+ ctrl.setSelectedLabel();
+ }
+ };
+
+ ctrl.toggleDropdown = function () {
+ if (!ctrl.loading && ctrl.items && ctrl.items.length > 0) {
+ ctrl.showDrop = !ctrl.showDrop;
+ ctrl.searchQuery = '';
+ ctrl.updateFilteredItems();
+ }
+ };
+
+ ctrl.selectItem = function (item) {
+ ctrl.selectedLabel = item[ctrl.displayProperty];
+ ctrl.showDrop = false;
+ ctrl.onSelect({ item: item });
+ };
+
+ ctrl.updateFilteredItems = function () {
+ if (!ctrl.items || !ctrl.displayProperty) {
+ ctrl.filteredItems = [];
+ return;
+ }
+
+ ctrl.filteredItems = ctrl.items.filter(function (item) {
+ var val = item[ctrl.displayProperty] || '';
+ return val.toLowerCase().indexOf(ctrl.searchQuery.toLowerCase()) !== -1;
+ });
+ };
+
+ ctrl.setSelectedLabel = function () {
+ if (!ctrl.selected || !ctrl.displayProperty) {
+ ctrl.selectedLabel = ctrl.placeholder || 'Please select...';
+ return;
+ }
+
+ // Attempt to match selected value in the list
+ var match = (ctrl.items || []).find(function (item) {
+ return item[ctrl.displayProperty] === ctrl.selected;
+ });
+
+ if (match) {
+ ctrl.selectedLabel = match[ctrl.displayProperty];
+ } else {
+ // fallback in case selected value is not in the list
+ ctrl.selectedLabel = ctrl.placeholder || 'Please select...';
+ // ctrl.onSelect(null);
+ }
+ };
+}
+
+module.exports = EntityDropdownController;
diff --git a/public/js/components/error-notification/error-notifcation.js b/public/js/components/error-notification/error-notifcation.js
new file mode 100644
index 00000000..ec2bf782
--- /dev/null
+++ b/public/js/components/error-notification/error-notifcation.js
@@ -0,0 +1,16 @@
+const { DatabusMsg } = require("../../utils/messages");
+
+function ErrorNotificationController() {
+ var ctrl = this;
+ ctrl.expanded = false;
+
+ ctrl.toggleExpand = function () {
+ ctrl.expanded = !ctrl.expanded;
+ };
+
+ ctrl.get = function(key) {
+ return DatabusMsg.get(key);
+ }
+}
+
+module.exports = ErrorNotificationController;
diff --git a/public/js/components/error-notification/error-notification.html b/public/js/components/error-notification/error-notification.html
new file mode 100644
index 00000000..ddc2e376
--- /dev/null
+++ b/public/js/components/error-notification/error-notification.html
@@ -0,0 +1,2 @@
+
+
+
+
+
+
+
+
+
+
+
+{{
+ $ctrl.get($ctrl.key) }}
diff --git a/public/js/components/facets-view/facets-view.js b/public/js/components/facets-view/facets-view.js
index 38eefc00..318046ad 100644
--- a/public/js/components/facets-view/facets-view.js
+++ b/public/js/components/facets-view/facets-view.js
@@ -119,6 +119,8 @@ function FacetsViewController($http, $scope) {
// wrap the node in the query node class
ctrl.node = QueryNode.createFrom(ctrl.node);
+
+ // Holds the view state as json
ctrl.viewModel = {};
if (ctrl.facets == undefined) {
@@ -136,12 +138,14 @@ function FacetsViewController($http, $scope) {
}).then(function (result) {
// Facets data has been loaded
- // Fix artifact facet values for groups
- if (ctrl.resourceType == 'group' && result.data[DatabusUris.DATABUS_ARTIFACT_PROPERTY] != undefined) {
- for (var i in result.data[DatabusUris.DATABUS_ARTIFACT_PROPERTY].values) {
- var value = result.data[DatabusUris.DATABUS_ARTIFACT_PROPERTY].values[i];
- result.data[DatabusUris.DATABUS_ARTIFACT_PROPERTY].values[i]
- = DatabusUtils.uriToName(value);
+ ctrl.facetsData = result.data;
+
+ // Fix artifact facet values for groups, change URIs into artifact names
+ var artifactFacetData = ctrl.facetsData[DatabusUris.DATABUS_ARTIFACT_PROPERTY];
+
+ if (artifactFacetData != null) {
+ for (var i in artifactFacetData.values) {
+ artifactFacetData.values[i] = DatabusUtils.uriToName(artifactFacetData.values[i]);
}
}
@@ -153,9 +157,9 @@ function FacetsViewController($http, $scope) {
// Prepare visible facet settings and autofill data based on the facet data returned by the API
// Create key base entries (unset, not overriden)
- for (var key in result.data) {
+ for (var key in ctrl.facetsData) {
- var facetData = result.data[key];
+ var facetData = ctrl.facetsData[key];
// Create a view data object for each facet
ctrl.viewModel[key] = {};
@@ -169,9 +173,7 @@ function FacetsViewController($http, $scope) {
for (var v in facetData.values) {
-
var value = facetData.values[v];
-
ctrl.viewModel[key].visibleFacetSettings.push({
value: value,
checked: false,
@@ -179,7 +181,7 @@ function FacetsViewController($http, $scope) {
});
}
- ctrl.viewModel[key].visibleFacetSettings.sort(function(a, b) {
+ ctrl.viewModel[key].visibleFacetSettings.sort(function (a, b) {
const valueA = a.value.toUpperCase();
const valueB = b.value.toUpperCase();
if (valueA > valueB) {
@@ -193,8 +195,8 @@ function FacetsViewController($http, $scope) {
});
// Show latest versions first
- if(key == DatabusUris.DCT_HAS_VERSION) {
- ctrl.viewModel[key].visibleFacetSettings.reverse();
+ if (key == DatabusUris.DCT_HAS_VERSION) {
+ ctrl.viewModel[key].visibleFacetSettings.reverse();
}
// Only show the top few
@@ -235,6 +237,7 @@ function FacetsViewController($http, $scope) {
// If we're a group node, check for artifact nodes and add them as facets
if (ctrl.resourceType == 'group') {
+
for (var i in ctrl.node.childNodes) {
var artifactNode = ctrl.node.childNodes[i];
var facetValue = DatabusUtils.uriToName(artifactNode.uri)
@@ -246,12 +249,28 @@ function FacetsViewController($http, $scope) {
if (ctrl.node.childNodes.length == 0) {
+
+ ctrl.updateArtifactFilters(ctrl.node);
+
+ var artifactFacetData = ctrl.facetsData[DatabusUris.DATABUS_ARTIFACT_PROPERTY];
+
+ if (artifactFacetData != null) {
+
+ // Add artifact nodes
+ for (var i in artifactFacetData.values) {
+ artifactFacetData.values[i] = DatabusUtils.uriToName(artifactFacetData.values[i]);
+ }
+ }
+
+ /*
// Add artifact nodes per default
for (var v of ctrl.viewModel[DatabusUris.DATABUS_ARTIFACT_PROPERTY].visibleFacetSettings) {
var childUri = ctrl.node.uri + '/' + v.value;
var artifactNode = new QueryNode(childUri, 'databus:artifact');
QueryNode.addChild(ctrl.node, artifactNode);
- }
+ }*/
+
+
}
}
@@ -263,6 +282,57 @@ function FacetsViewController($http, $scope) {
});
}
+ ctrl.updateArtifactFilters = function (groupNode) {
+
+ // Clear all child nodes
+ groupNode.childNodes.length = 0;
+
+ var hasCheckedArtifactFacets = false;
+
+ for (var setting of ctrl.viewModel[DatabusUris.DATABUS_ARTIFACT_PROPERTY].visibleFacetSettings) {
+ hasCheckedArtifactFacets = hasCheckedArtifactFacets || setting.checked;
+ }
+
+ if (hasCheckedArtifactFacets) {
+
+ for (var setting of ctrl.viewModel[DatabusUris.DATABUS_ARTIFACT_PROPERTY].visibleFacetSettings) {
+ if (setting.checked) {
+ var artifactUri = `${groupNode.uri}/${setting.value}`;
+ if (QueryNode.findChildByUri(groupNode, artifactUri) == null) {
+ var artifactNode = new QueryNode(artifactUri, 'databus:artifact');
+ QueryNode.addChild(groupNode, artifactNode);
+ }
+ }
+ }
+
+ } else {
+
+ var latestVersionSetting = QueryNode.findFacetSetting(groupNode,
+ DatabusUris.DCT_HAS_VERSION,
+ DatabusConstants.FACET_LATEST_VERSION_VALUE);
+
+ if (latestVersionSetting != undefined && latestVersionSetting.checked) {
+
+ var artifactFacetData = ctrl.facetsData[DatabusUris.DATABUS_ARTIFACT_PROPERTY];
+
+ if (artifactFacetData != null) {
+
+ // Add artifact nodes
+ for (var value of artifactFacetData.values) {
+ var artifactUri = `${groupNode.uri}/${value}`;
+ if (QueryNode.findChildByUri(groupNode, artifactUri) == null) {
+ var artifactNode = new QueryNode(artifactUri, 'databus:artifact');
+ QueryNode.addChild(groupNode, artifactNode);
+ }
+ }
+
+ }
+ }
+ }
+
+ }
+
+
ctrl.getFacetLabel = function (value) {
if (value == DatabusConstants.FACET_LATEST_VERSION_VALUE) {
return DatabusConstants.FACET_LATEST_VERSION_LABEL;
@@ -281,21 +351,15 @@ function FacetsViewController($http, $scope) {
if (ctrl.resourceType == 'group' && key == DatabusUris.DATABUS_ARTIFACT_PROPERTY) {
- var childUri = ctrl.node.uri + '/' + value;
-
- if (targetState) {
- var artifactNode = new QueryNode(childUri, 'databus:artifact');
- QueryNode.addChild(ctrl.node, artifactNode);
- } else {
- QueryNode.removeChildByUri(ctrl.node, childUri);
- }
-
var visibleSetting = ctrl.getOrCreateVisibleFacetSetting(key, value);
if (visibleSetting != null) {
visibleSetting.checked = targetState;
visibleSetting.isOverride = targetState;
}
+
+ ctrl.updateArtifactFilters(ctrl.node);
+
}
else {
// apply change to view model
diff --git a/public/js/components/file-browser/file-browser.html b/public/js/components/file-browser/file-browser.html
index 7c19b67a..0ab3bd01 100644
--- a/public/js/components/file-browser/file-browser.html
+++ b/public/js/components/file-browser/file-browser.html
@@ -34,7 +34,7 @@
{{ $ctrl.numFiles }} file(s) / {{
$ctrl.totalSize }}
-
+
+
\ No newline at end of file
diff --git a/public/js/components/search/search-controller.js b/public/js/components/search/search-controller.js
index 6cfd5c58..163d21d1 100644
--- a/public/js/components/search/search-controller.js
+++ b/public/js/components/search/search-controller.js
@@ -19,7 +19,7 @@ function SearchController($http, $interval, $sce, searchManager) {
ctrl.search();
}
- ctrl.availableResourceTypes = ['Collection', 'Artifact', 'Group', 'PersonalProfileDocument', 'Version' ];
+ ctrl.availableResourceTypes = ['Collection', 'Artifact', 'Group', 'Account', 'Version' ];
ctrl.$onInit = function () {
diff --git a/public/js/components/search/search.html b/public/js/components/search/search.html
index 6cb00b7e..553d3393 100644
--- a/public/js/components/search/search.html
+++ b/public/js/components/search/search.html
@@ -38,7 +38,7 @@
resource.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Results ({{ $ctrl.results.length }}):
+
+
+
+
+
+
+ Filters:
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Your search did not match any
+ resource.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/public/js/components/table-editor/table-editor.html b/public/js/components/table-editor/table-editor.html
index 905bd309..fd7ad440 100644
--- a/public/js/components/table-editor/table-editor.html
+++ b/public/js/components/table-editor/table-editor.html
@@ -85,52 +85,143 @@
.edit-table .edit:focus {
outline: none;
}
+
+
+ .flex-table {
+ border: 1px solid #dbdbdb;
+ overflow-x: scroll;
+ }
+
+ .flex-table .row {
+ display: flex;
+ min-width: max-content;
+ border-bottom: 1px solid #dbdbdb;
+ }
+
+ .flex-table .row.header {
+ background-color: #f6f6f6;
+ font-weight: 600;
+ }
+
+ .flex-table .cell {
+ min-width: 140px;
+ flex: 1;
+ height: 48px;
+ display: flex;
+ align-items: center;
+ padding-left: 1em;
+ }
+
+ .flex-table .cell.tiny {
+ min-width: 48px;
+ width: 48px;
+ flex: 0;
+ }
+
+ .flex-table .cell.main {
+ flex: 1.5;
+ min-width: 215px;
+ max-width: 215px;
+ }
+
+ .flex-table .cell.readonly {
+ background-color: #f6f6f6;
+ }
+
+ .flex-table .cell.edit {
+ cursor: text;
+ border: none;
+ background-color: inherit;
+ font-family: inherit;
+ outline: none;
+ margin: 0;
+ width: 0;
+ }
+
+ .flex-table .cell.edit {
+ cursor: text;
+ border: none;
+ background-color: inherit;
+ font-family: inherit;
+ outline: none;
+ margin: 0;
+ width: 0;
+ }
+
+ .flex-table .cell:focus {
+ background-color: #e2f5ff;
+ }
+
+ .flex-table .cell:not(:first-child) {
+ border-left: 1px solid #dbdbdb;
+ }
+
+ .flex-table .cell input {
+ min-width: 100%;
+ width: 100px;
+ }
+
+ .flex-table .cell.cv:nth-child(3) {
+ min-width: 120px;
+ }
+
+ .flex-table .cell.cv:nth-child(4) {
+ min-width: 170px;
+ }
+
+
- Format
- Compression
- {{ cv.label }}
- Status/Actions
+ {{ cv.label }}
-
{{ $index + 1 }}
{{ file.name }}
-
- {{ file.formatExtension }}
- {{ file.compression }}
-
-
- {{ file.contentVariants[cv.label]
- }}
-
-
+
-
+
+
+
+
+ {{ file.contentVariants[cv.label]
+ }}
+
+
@@ -167,8 +271,8 @@
-
+-->
\ No newline at end of file
diff --git a/public/js/components/table-editor/table-editor.js b/public/js/components/table-editor/table-editor.js
index 6b352be4..2d9d3c99 100644
--- a/public/js/components/table-editor/table-editor.js
+++ b/public/js/components/table-editor/table-editor.js
@@ -29,12 +29,15 @@ function TableEditorController() {
return width + 22;
}
+ ctrl.editContentVariant = function(index) {
+
+ ctrl.onEditContentVariant({ index: index});
+ }
+
ctrl.setupColumns = function() {
ctrl.columns = [];
ctrl.columns.push({ title:'File', width: 400, isReadonly : true });
- ctrl.columns.push({ title:'Format', width: 75, isReadonly : true });
- ctrl.columns.push({ title:'Compression', width: 115, isReadonly : true });
for(var c in ctrl.model.contentVariants) {
var cv = ctrl.model.contentVariants[c];
@@ -65,18 +68,12 @@ function TableEditorController() {
ctrl.selectCell = function($event, x, y) {
- if(ctrl.selection.x == x && ctrl.selection.y == y) {
- ctrl.edit.x = x;
- ctrl.edit.y = y;
-
- // $event.target.setSelectionRange(0, $event.target.value.length)
- // $event.target.selectionStart = 0;
- // $event.target.selectionEnd = $event.target.value.length;
- return;
- }
-
+
ctrl.edit.x = undefined;
ctrl.edit.y = undefined;
+
+ ctrl.edit.x = x;
+ ctrl.edit.y = y;
ctrl.selection.x = x;
ctrl.selection.y = y;
ctrl.selection.width = 1;
@@ -93,19 +90,19 @@ function TableEditorController() {
var index = ctrl.model.files.findIndex(f => f.uri == file.uri);
for(var i = index + 1; i < index + file.rowspan; i++) {
- ctrl.model.files[i].contentVariants[cv.label] = file.contentVariants[cv.label];
+ ctrl.model.files[i].contentVariants[cv.id] = file.contentVariants[cv.id];
}
- ctrl.model.isConfigDirty = true
+ ctrl.model.onChange();
}
ctrl.updateViewModel = function() {
-
for(var f in ctrl.model.files) {
ctrl.model.files[f].rowspan = 1;
}
+ /*
if(ctrl.model.groupMode) {
var i = 0;
@@ -115,12 +112,12 @@ function TableEditorController() {
if(ctrl.model.files[i].name == ctrl.model.files[i + step].name) {
// Swallow the cv setting of the next row
- ctrl.model.files[i].rowspan++;
- ctrl.model.files[i + step].rowspan = 0;
+ // ctrl.model.files[i].rowspan++;
+ // ctrl.model.files[i + step].rowspan = 0;
for(var c in ctrl.model.contentVariants) {
var cv = ctrl.model.contentVariants[c];
- ctrl.model.files[i + step].contentVariants[cv.label] = ctrl.model.files[i].contentVariants[cv.label];
+ ctrl.model.files[i + step].contentVariants[cv.id] = ctrl.model.files[i].contentVariants[cv.id];
}
step++;
@@ -129,7 +126,7 @@ function TableEditorController() {
step = 1;
}
}
- }
+ }*/
}
@@ -138,8 +135,8 @@ function TableEditorController() {
* @param {*} artifact
* @param {*} file
*/
- ctrl.removeFileFromArtifact = function(file) {
- ctrl.onRemoveFile({ file : file });
+ ctrl.removeFileFromArtifact = function(file, index) {
+ ctrl.onRemoveFile({ file : file, index: index});
}
ctrl.$doCheck = function() {
diff --git a/public/js/components/type-tag/type-tag.js b/public/js/components/type-tag/type-tag.js
index 94c849a0..ec3142af 100644
--- a/public/js/components/type-tag/type-tag.js
+++ b/public/js/components/type-tag/type-tag.js
@@ -8,7 +8,7 @@ function TypeTagController() {
ctrl.typeMap["Version"] = "is-version";
ctrl.typeMap["Group"] = "is-group";
ctrl.typeMap["Service"] = "is-service";
- ctrl.typeMap["PersonalProfileDocument"] = "is-consumer";
+ ctrl.typeMap["Account"] = "is-consumer";
ctrl.typeMap["Collection"] = "is-collection";
ctrl.typeMap["BlogEntry"] = "is-blog";
ctrl.typeMap["Databus"] = "is-version";
@@ -19,7 +19,7 @@ function TypeTagController() {
ctrl.iconMap["Version"] = "M 14.9 1 L 12.293 1.005 L 16.507 7.18 L 16.5 23.1 L 18.5 23.1 L 18.5 6.4 L 14.9 1 Z M 10.4 1 L 1.581 1.004 L 1.584 23.13 L 15 23.1 L 15 7.7 L 10.4 1 Z M 16.8 1 L 20 5.8 L 20 23.1 L 22 23.1 L 22 4.9 L 19.3 1 L 16.8 1 Z";
ctrl.iconMap["Group"] = "M21.698 10.658l2.302 1.342-12.002 7-11.998-7 2.301-1.342 9.697 5.658 9.7-5.658zm-9.7 10.657l-9.697-5.658-2.301 1.343 11.998 7 12.002-7-2.302-1.342-9.7 5.657zm12.002-14.315l-12.002-7-11.998 7 11.998 7 12.002-7z";
ctrl.iconMap["Service"] = "M24 13.616v-3.232l-2.869-1.02c-.198-.687-.472-1.342-.811-1.955l1.308-2.751-2.285-2.285-2.751 1.307c-.613-.339-1.269-.613-1.955-.811l-1.021-2.869h-3.232l-1.021 2.869c-.686.198-1.342.471-1.955.811l-2.751-1.308-2.285 2.285 1.308 2.752c-.339.613-.614 1.268-.811 1.955l-2.869 1.02v3.232l2.869 1.02c.197.687.472 1.342.811 1.955l-1.308 2.751 2.285 2.286 2.751-1.308c.613.339 1.269.613 1.955.811l1.021 2.869h3.232l1.021-2.869c.687-.198 1.342-.472 1.955-.811l2.751 1.308 2.285-2.286-1.308-2.751c.339-.613.613-1.268.811-1.955l2.869-1.02zm-12 2.384c-2.209 0-4-1.791-4-4s1.791-4 4-4 4 1.791 4 4-1.791 4-4 4z";
- ctrl.iconMap["PersonalProfileDocument"] = "M19 7.001c0 3.865-3.134 7-7 7s-7-3.135-7-7c0-3.867 3.134-7.001 7-7.001s7 3.134 7 7.001zm-1.598 7.18c-1.506 1.137-3.374 1.82-5.402 1.82-2.03 0-3.899-.685-5.407-1.822-4.072 1.793-6.593 7.376-6.593 9.821h24c0-2.423-2.6-8.006-6.598-9.819z";
+ ctrl.iconMap["Account"] = "M19 7.001c0 3.865-3.134 7-7 7s-7-3.135-7-7c0-3.867 3.134-7.001 7-7.001s7 3.134 7 7.001zm-1.598 7.18c-1.506 1.137-3.374 1.82-5.402 1.82-2.03 0-3.899-.685-5.407-1.822-4.072 1.793-6.593 7.376-6.593 9.821h24c0-2.423-2.6-8.006-6.598-9.819z";
ctrl.iconMap["Collection"] = "M11.499 12.03v11.971l-10.5-5.603v-11.835l10.5 5.467zm11.501 6.368l-10.501 5.602v-11.968l10.501-5.404v11.77zm-16.889-15.186l10.609 5.524-4.719 2.428-10.473-5.453 4.583-2.499zm16.362 2.563l-4.664 2.4-10.641-5.54 4.831-2.635 10.474 5.775z";
ctrl.iconMap["BlogEntry"] = "M21 9.662c-2.287.194-5.197 1.038-7 1.794v-1.064c1.933-.721 4.598-1.54 7-1.745v1.015zm0 2.031c-2.287.194-5.197 1.038-7 1.794v-1.064c1.933-.721 4.598-1.54 7-1.745v1.015zm0 2.031c-2.287.194-5.197 1.038-7 1.794v-1.064c1.933-.721 4.598-1.54 7-1.745v1.015zm0 2.031c-2.287.194-5.197 1.038-7 1.794v-1.064c1.933-.721 4.598-1.54 7-1.745v1.015zm0-9.951c-2.402.204-5.068 1.024-7 1.745v1.933c1.804-.756 4.713-1.6 7-1.794v-1.884zm-18 2.843c2.402.205 5.067 1.024 7 1.745v1.064c-1.803-.756-4.713-1.6-7-1.794v-1.015zm0 2.031c2.402.205 5.067 1.024 7 1.745v1.064c-1.803-.756-4.713-1.6-7-1.794v-1.015zm0 2.031c2.402.205 5.067 1.024 7 1.745v1.064c-1.803-.756-4.713-1.6-7-1.794v-1.015zm0 2.032c2.402.205 5.067 1.024 7 1.745v1.064c-1.803-.756-4.713-1.6-7-1.794v-1.015zm0-7.054c2.287.194 5.196 1.038 7 1.794v-1.933c-1.932-.72-4.598-1.54-7-1.744v1.883zm9-2.724c-3.063-1.671-7.776-2.755-12-2.963v17c4.289.206 8.195 1.249 12 3 3.805-1.751 7.711-2.794 12-3v-17c-4.224.208-8.937 1.292-12 2.963zm-10-.791c4.264.496 6.86 1.467 9 2.545v12.702c-2.968-1.184-5.939-1.95-9-2.271v-12.976zm20 12.975c-3.061.321-6.032 1.088-9 2.271v-12.701c2.187-1.103 4.757-2.051 9-2.544v12.974z";
ctrl.iconMap["Databus"] = "m 0.76949155,0.7702454 v 5.24959 l 29.33129045,-10e-4 6.27262,8.8675006 -0.002,32.0824 4.7212,-0.002 V 0.7702354 Z m 18.43511045,8.3952603 -5.68354,0.006 7.1979,10.5484003 -0.004,27.24663 4.70393,-0.002 0.0167,-28.60108 z m -9.4730904,0.002 -8.96510005,0.002 0.004,37.7960503 16.79563045,-0.004 0.001,-26.29103 z m 13.2512904,0 5.59825,8.2188903 -0.0396,29.57614 4.70307,-0.002 0.006,-31.09587 -4.55858,-6.6940403 z";
diff --git a/public/js/page-controller/account-controller.js b/public/js/page-controller/account-controller.js
index 76a012b7..660c842a 100644
--- a/public/js/page-controller/account-controller.js
+++ b/public/js/page-controller/account-controller.js
@@ -1,3 +1,4 @@
+const DatabusCollectionManager = require("../collections/databus-collection-manager");
const DatabusUtils = require("../utils/databus-utils");
const DatabusWebappUtils = require("../utils/databus-webapp-utils");
const TabNavigation = require("../utils/tab-navigation");
@@ -5,6 +6,15 @@ const TabNavigation = require("../utils/tab-navigation");
var DEFAULT_IMAGE = "https://picsum.photos/id/223/320/320";
// Controller for the header section
+
+/**
+ *
+ * @param {*} $scope
+ * @param {*} $http
+ * @param {*} $location
+ * @param {DatabusCollectionManager} collectionManager
+ * @returns
+ */
function AccountPageController($scope, $http, $location, collectionManager) {
$scope.collectionManager = collectionManager;
@@ -13,15 +23,13 @@ function AccountPageController($scope, $http, $location, collectionManager) {
// Pick up the profile data
$scope.auth = data.auth;
$scope.location = $location;
-
- $scope.profileData = data.profile;
+ $scope.account = data.account;
// Exit if there is no profile
- if ($scope.profileData == undefined) {
+ if ($scope.account == undefined) {
return;
}
- $scope.profileData.isOwn = $scope.auth.authenticated && $scope.auth.info.accountName == $scope.profileData.accountName;
// Create a tab navigation object for the tab navigation with locato
$scope.tabNavigation = new TabNavigation($scope, $location, [
@@ -30,32 +38,34 @@ function AccountPageController($scope, $http, $location, collectionManager) {
// Make some util functions available in the template
$scope.utils = new DatabusWebappUtils($scope);
+ $scope.accountName = $scope.utils.getAccountName();
+ $scope.account.isOwn = $scope.accountName != null; //.auth.authenticated && $scope.auth.info.accountName == $scope.account.accountName;
$scope.dataSearchInput = '';
$scope.dataSearchSettings = {
minRelevance: 0.01,
maxResults: 10,
- placeholder: `Search ${$scope.profileData.accountName}'s data...`,
+ placeholder: `Search ${$scope.account.accountName}'s data...`,
resourceTypes: ['Group', 'Artifact'],
- filter: `&publisher=${$scope.profileData.accountName}&typeNameWeight=0`
+ filter: `&publisher=${$scope.account.accountName}&typeNameWeight=0`
};
$scope.collectionSearchInput = '';
$scope.collectionSearchSettings = {
minRelevance: 0.01,
maxResults: 10,
- placeholder: `Search ${$scope.profileData.accountName}'s collections...`,
+ placeholder: `Search ${$scope.account.accountName}'s collections...`,
resourceTypes: ['Collection'],
- filter: `&publisher=${$scope.profileData.accountName}&publisherWeight=0&typeNameWeight=0`
+ filter: `&publisher=${$scope.account.accountName}&publisherWeight=0&typeNameWeight=0`
};
-
+
// Wait for additional artifact data to arrive
$scope.publishedData = {};
$scope.publishedData.isLoading = true;
- $http.get(`/app/account/content?account=${encodeURIComponent($scope.profileData.accountName)}`)
+ $http.get(`/app/account/content?account=${encodeURIComponent($scope.account.accountName)}`)
.then(function (response) {
$scope.publishedData.isLoading = false;
@@ -95,7 +105,7 @@ function AccountPageController($scope, $http, $location, collectionManager) {
$scope.statsData = {};
$scope.statsData.isLoading = true;
- $http.get(`/app/account/stats?account=${encodeURIComponent($scope.profileData.accountName)}`).then(function (response) {
+ $http.get(`/app/account/stats?account=${encodeURIComponent($scope.account.accountName)}`).then(function (response) {
$scope.statsData.stats = response.data;
$scope.statsData.isLoading = false;
}, function (err) {
@@ -106,7 +116,7 @@ function AccountPageController($scope, $http, $location, collectionManager) {
$scope.activityData = {};
$scope.activityData.isLoading = true;
- $http.get(`/app/account/activity?account=${encodeURIComponent($scope.profileData.accountName)}`).then(function (response) {
+ $http.get(`/app/account/activity?account=${encodeURIComponent($scope.account.accountName)}`).then(function (response) {
$scope.activityData.entries = response.data;
$scope.activityData.isLoading = false;
}, function (err) {
@@ -116,8 +126,8 @@ function AccountPageController($scope, $http, $location, collectionManager) {
$scope.collectionsData = {};
$scope.collectionsData.isLoading = true;
- if (!$scope.profileData.isOwn) {
- $http.get(`/app/account/collections?account=${encodeURIComponent($scope.profileData.accountName)}`)
+ if (!$scope.account.isOwn) {
+ $http.get(`/app/account/collections?account=${encodeURIComponent($scope.account.accountName)}`)
.then(function (response) {
$scope.collectionsData.collections = response.data;
@@ -126,13 +136,38 @@ function AccountPageController($scope, $http, $location, collectionManager) {
}, function (err) {
console.log(err);
});
+ } else {
+
+ function onCollectionManagerInitialized() {
+ for (let guid in $scope.collectionManager.local) {
+ let collection = $scope.collectionManager.local[guid];
+
+ if(collection.accountName == undefined && collection.uri != undefined) {
+ collection.accountName = DatabusUtils.getFirstSegment(collection.uri);
+ }
+
+ if (collection.accountName == $scope.accountName) {
+ $scope.collectionList.push(collection);
+ }
+ }
+ }
+
+ $scope.collectionList = [];
+
+ if(collectionManager.isInitialized) {
+ onCollectionManagerInitialized();
+ } else {
+ collectionManager.subscribeOnInitialized(onCollectionManagerInitialized);
+ }
}
+
+
$scope.getImageUrl = function () {
- if ($scope.profileData.imageUrl == undefined) {
+ if ($scope.account.imageUrl == undefined) {
return DEFAULT_IMAGE;
} else {
- return $scope.profileData.imageUrl;
+ return $scope.account.imageUrl;
}
}
@@ -144,13 +179,13 @@ function AccountPageController($scope, $http, $location, collectionManager) {
$scope.collectionSearch = {};
$scope.collectionSearch.sortVisible = false;
$scope.collectionSearch.sortProperty = 'title';
- $scope.collectionSearch.sortProperties = [
+ $scope.collectionSearch.sortProperties = [
{ key: 'title', label: 'Title' },
{ key: 'issued', label: 'Issued Date' },
];
$scope.collectionSearch.sortReverse = false;
- $scope.collectionSearch.toggleSort = function(value) {
- if($scope.collectionSearch.sortProperty == value) {
+ $scope.collectionSearch.toggleSort = function (value) {
+ if ($scope.collectionSearch.sortProperty == value) {
$scope.collectionSearch.sortReverse = !$scope.collectionSearch.sortReverse;
} else {
$scope.collectionSearch.sortProperty = value;
@@ -163,25 +198,25 @@ function AccountPageController($scope, $http, $location, collectionManager) {
*/
$scope.onEditCollectionClicked = function (collection) {
$scope.collectionManager.setActive(collection.uuid);
- window.location.href = '/app/collection-editor';
+ window.location.href = `/app/collection-editor?uuid=${collection.uuid}`;
}
/**
* Create new collection
*/
$scope.createNewCollection = function () {
- $scope.collectionManager.createNew('New Collection', 'Replace this description with a description of your choice.',
- function (success) {
- window.location.href = '/app/collection-editor';
+ $scope.collectionManager.createNew($scope.accountName, 'New Collection', 'Replace this description with a description of your choice.',
+ function (collection) {
+ window.location.href = `/app/collection-editor?uuid=${collection.uuid}`;
});
}
/**
* Create a copy of the clicked collection
*/
- $scope.createCopy = function(collection) {
- $scope.collectionManager.createCopy(collection);
- window.location.href = '/app/collection-editor';
+ $scope.createCopy = function (collection) {
+ let copy = $scope.collectionManager.createCopy(collection);
+ window.location.href = `/app/collection-editor?uuid=${copy.uuid}`;
}
@@ -229,11 +264,11 @@ function AccountPageController($scope, $http, $location, collectionManager) {
}
$scope.refreshFeaturedContent = function () {
- if ($scope.profileData.featuredContent == undefined) {
+ if ($scope.account.featuredContent == undefined) {
return;
}
- var featuredContentUris = $scope.profileData.featuredContent.split('\n');
+ var featuredContentUris = $scope.account.featuredContent.split('\n');
$scope.featuredContent = [];
for (var f in featuredContentUris) {
@@ -245,6 +280,8 @@ function AccountPageController($scope, $http, $location, collectionManager) {
}
}
+ /** ACCOUNT MANAGEMENT FOR OWNER */
+
}
module.exports = AccountPageController;
\ No newline at end of file
diff --git a/public/js/page-controller/artifact-controller.js b/public/js/page-controller/artifact-controller.js
index ce6a8d05..e20bb00c 100644
--- a/public/js/page-controller/artifact-controller.js
+++ b/public/js/page-controller/artifact-controller.js
@@ -13,7 +13,10 @@ function ArtifactPageController($scope, $http, $sce, $location, collectionManage
$scope.collectionManager = collectionManager;
$scope.authenticated = data.auth.authenticated;
+ $scope.auth = data.auth;
$scope.utils = new DatabusWebappUtils($scope, $sce);
+ $scope.accountName = $scope.utils.getAccountName();
+
$scope.tabNavigation = new TabNavigation($scope, $location, [
'files', 'versions', 'edit'
]);
@@ -21,7 +24,7 @@ function ArtifactPageController($scope, $http, $sce, $location, collectionManage
$scope.versions = data.versions;
$scope.artifact = data.artifact;
$scope.accountName = DatabusUtils.uriToName(DatabusUtils.navigateUp($scope.artifact.uri, 2));
- $scope.canEdit = $scope.accountName == data.auth.info.accountName;
+ $scope.canEdit = $scope.accountName != null;
$scope.pageTitle = DatabusUtils.stringOrFallback($scope.artifact.title,
DatabusUtils.uriToTitle($scope.artifact.uri));
@@ -39,11 +42,12 @@ function ArtifactPageController($scope, $http, $sce, $location, collectionManage
$scope.formData.artifact.abstract = $scope.artifact.abstract;
$scope.formData.artifact.description = $scope.artifact.description;
- $scope.dataidCreator = new DataIdCreator($scope.formData, data.auth.info.accountName);
+ $scope.dataidCreator = new DataIdCreator($scope.formData, $scope.accountName);
}
$scope.fileSelector = {};
$scope.fileSelector.config = {};
+ $scope.fileSelector.config.authenticated = $scope.authenticated;
$scope.fileSelector.config.columns = [];
$scope.fileSelector.config.columns.push({ field: 'version', label: 'Version', width: '30%' });
$scope.fileSelector.config.columns.push({ field: 'variant', label: 'Variant', width: '30%' });
@@ -144,8 +148,7 @@ function ArtifactPageController($scope, $http, $sce, $location, collectionManage
var artifactUpdate = $scope.dataidCreator.createArtifactUpdate();
- var relativeUri = new URL($scope.artifact.uri).pathname;
- var response = await $http.put(relativeUri, artifactUpdate);
+ var response = await $http.post(`/api/register`, artifactUpdate);
if (response.status == 200) {
$scope.artifact.title = $scope.formData.artifact.title;
diff --git a/public/js/page-controller/collection-controller.js b/public/js/page-controller/collection-controller.js
index b0138dda..aad53a2b 100644
--- a/public/js/page-controller/collection-controller.js
+++ b/public/js/page-controller/collection-controller.js
@@ -6,6 +6,7 @@ const DatabusWebappUtils = require("../utils/databus-webapp-utils");
function CollectionController($scope, $sce, $http, collectionManager) {
+ $scope.auth = data.auth;
$scope.collection = new DatabusCollectionWrapper(data.collection);
$scope.authenticated = data.auth.authenticated;
$scope.activeTab = 0;
@@ -13,21 +14,15 @@ function CollectionController($scope, $sce, $http, collectionManager) {
// Make some util functions available in the template
$scope.utils = new DatabusWebappUtils($scope, $sce);
+ $scope.accountName = $scope.utils.getAccountName();
$scope.isOwn = false;
if ($scope.authenticated) {
-
$scope.collectionAccountName = DatabusUtils.uriToName(DatabusUtils.navigateUp($scope.collection.uri, 2));
- $scope.accountName = data.auth.info.accountName;
-
$scope.isOwn = $scope.accountName === $scope.collectionAccountName;
}
- $scope.editCollection = function () {
- $scope.collectionManager.setActive($scope.collection.uuid);
- window.location = `/app/collection-editor`;
- }
$scope.collectionViewModel = {};
$scope.collectionViewModel.downloadScript = [];
@@ -73,8 +68,7 @@ function CollectionController($scope, $sce, $http, collectionManager) {
let localCopy = $scope.collectionManager.createCopy($scope.collection);
- $scope.collectionManager.setActive(localCopy.uuid);
- window.location.href = '/app/collection-editor'
+ window.location.href = `/app/collection-editor?uuid${localCopy.uuid}`;
}
$scope.createSnapshot = function () {
@@ -84,11 +78,10 @@ function CollectionController($scope, $sce, $http, collectionManager) {
let collectionSnapshot = $scope.collectionManager.createSnapshot($scope.collection);
-
- $scope.collectionManager.setActive(collectionSnapshot.uuid);
- window.location.href = '/app/collection-editor'
+ window.location.href = `/app/collection-editor?uuid${collectionSnapshot.uuid}`;
}
+
$scope.editCollection = function () {
if (!$scope.collectionManager.isInitialized) {
@@ -99,15 +92,15 @@ function CollectionController($scope, $sce, $http, collectionManager) {
/// TODO Fabian - das sollte nicht passieren!
if (localCopy === null) {
- console.log("editCollection failed due there is no collection with that uri: " + $scope.collection.uri)
+ console.log("editCollection failed. There is no collection with that uri: " + $scope.collection.uri)
$scope.editCopy();
return;
}
- $scope.collectionManager.setActive(localCopy.uuid);
- window.location.href = '/app/collection-editor'
+ window.location.href = `/app/collection-editor?uuid=${localCopy.uuid}`;
}
+
$scope.downloadAsJson = function () {
DatabusCollectionUtils.exportToJsonFile($scope.collection);
}
diff --git a/public/js/page-controller/collections-editor-controller.js b/public/js/page-controller/collections-editor-controller.js
index 5ca723a4..4f4ca9f7 100644
--- a/public/js/page-controller/collections-editor-controller.js
+++ b/public/js/page-controller/collections-editor-controller.js
@@ -17,8 +17,9 @@ const TabNavigation = require("../utils/tab-navigation");
* @param {*} collectionManager
* @returns
*/
-function CollectionsEditorController($scope, $timeout, $http, $location, collectionManager) {
+async function CollectionsEditorController($scope, $timeout, $http, $location, collectionManager) {
+ $scope.auth = data.auth;
$scope.authenticated = data.auth.authenticated;
$scope.baseUrl = DATABUS_RESOURCE_BASE_URL;
@@ -27,23 +28,44 @@ function CollectionsEditorController($scope, $timeout, $http, $location, collect
return;
}
- $scope.accountName = data.auth.info.accountName;
- $scope.hasAccount = $scope.accountName != undefined;
+ const params = new URLSearchParams(window.location.search);
+ $scope.uuid = params.get('uuid');
+
+ // Make some util functions available in the template
+ $scope.utils = new DatabusWebappUtils($scope);
+ $scope.collectionManager = collectionManager;
+
+ let collection = $scope.collectionManager.local[$scope.uuid];
- if (!$scope.hasAccount) {
+ if(collection == null) {
+ // No working copy found
return;
}
+ try {
+ let collection = $scope.collectionManager.local[$scope.uuid];
+ await $scope.collectionManager.tryInitialize(collection.accountName);
+ } catch(err) {
+
+ }
+
+ $scope.collectionManager.setActive($scope.uuid);
+ let activeCollection = $scope.collectionManager.activeCollection;
+
+ $scope.accountName = $scope.utils.getOwnedAccountName(activeCollection.accountName);
+ $scope.hasAccount = $scope.accountName != undefined;
+
+ //if (!$scope.hasAccount) {
+ // return;
+ //}
+
// Create a tab navigation object for the tab navigation with locato
$scope.tabNavigation = new TabNavigation($scope, $location, [
'docu', 'content', 'preview', 'query', 'json', 'import'
]);
- // Make some util functions available in the template
- $scope.utils = new DatabusWebappUtils($scope);
-
// Make the manager available in the template
- $scope.collectionManager = collectionManager;
+ // $scope.collectionManager.setActiveCollection($scope.guid);
// Form data object for input errors and extra fields and toggles
$scope.form = {};
diff --git a/public/js/page-controller/frontpage-controller.js b/public/js/page-controller/frontpage-controller.js
index b1b8fe58..daa7102e 100644
--- a/public/js/page-controller/frontpage-controller.js
+++ b/public/js/page-controller/frontpage-controller.js
@@ -54,6 +54,18 @@ function FrontPageController($scope, $sce, $http) {
console.log(err);
});
+ // Login function
+ $scope.login = function () {
+ window.location = '/app/login?redirectUrl=' + encodeURIComponent(window.location);
+ }
+
+ $scope.goToPage = function(path) {
+ window.location = path;
+ }
+
+ $scope.account = function() {
+ window.location = '/app/account';
+ }
for(var d in $scope.uploadRankingData) {
$scope.uploadRankingData[d].uploadSize = DatabusUtils.formatFileSize($scope.uploadRankingData[d].uploadSize);
diff --git a/public/js/page-controller/group-controller.js b/public/js/page-controller/group-controller.js
index be962aa8..a844e130 100644
--- a/public/js/page-controller/group-controller.js
+++ b/public/js/page-controller/group-controller.js
@@ -4,6 +4,7 @@ const DataIdCreator = require("../publish/dataid-creator");
const QueryBuilder = require("../query-builder/query-builder");
const QueryNode = require("../query-builder/query-node");
const QueryTemplates = require("../query-builder/query-templates");
+const DatabusConstants = require("../utils/databus-constants");
const DatabusUtils = require("../utils/databus-utils");
const DatabusWebappUtils = require("../utils/databus-webapp-utils");
const TabNavigation = require("../utils/tab-navigation");
@@ -11,9 +12,13 @@ const TabNavigation = require("../utils/tab-navigation");
function GroupPageController($scope, $http, $sce, $interval, $location, collectionManager) {
$scope.group = data.group;
- $scope.accountName = DatabusUtils.uriToName(DatabusUtils.navigateUp($scope.group.uri));
+ // $scope.accountName = DatabusUtils.uriToName(DatabusUtils.navigateUp($scope.group.uri));
+ $scope.auth = data.auth;
$scope.utils = new DatabusWebappUtils($scope, $sce);
+ $scope.accountName = $scope.utils.getAccountName();
+
+
$scope.tabNavigation = new TabNavigation($scope, $location, [
'files', 'artifacts', 'edit'
]);
@@ -60,7 +65,7 @@ function GroupPageController($scope, $http, $sce, $interval, $location, collecti
DatabusUtils.uriToTitle($scope.group.uri));
- $scope.canEdit = $scope.accountName == data.auth.info.accountName;
+ $scope.canEdit = $scope.accountName != null;
if (data.auth.authenticated && $scope.canEdit) {
@@ -73,7 +78,7 @@ function GroupPageController($scope, $http, $sce, $interval, $location, collecti
$scope.formData.group.abstract = $scope.group.abstract;
$scope.formData.group.description = $scope.group.description;
- $scope.dataidCreator = new DataIdCreator($scope.formData, data.auth.info.accountName);
+ $scope.dataidCreator = new DataIdCreator($scope.formData, $scope.accountName);
}
$scope.onDescriptionChanged = function () {
@@ -104,7 +109,7 @@ function GroupPageController($scope, $http, $sce, $interval, $location, collecti
var groupUpdate = $scope.dataidCreator.createGroupUpdate();
var relativeUri = new URL($scope.group.uri).pathname;
- var response = await $http.put(relativeUri, groupUpdate);
+ var response = await $http.post('/api/register', groupUpdate);
if (response.status == 200) {
$scope.group.title = $scope.formData.group.title;
@@ -135,6 +140,7 @@ function GroupPageController($scope, $http, $sce, $interval, $location, collecti
$scope.fileSelector = {};
$scope.fileSelector.config = {};
+ $scope.fileSelector.config.authenticated = $scope.authenticated;
$scope.fileSelector.config.columns = [];
$scope.fileSelector.config.columns.push({ field: 'artifact', label: 'Artifact', width: '30%', uriToName: true });
$scope.fileSelector.config.columns.push({ field: 'version', label: 'Version', width: '21%' });
@@ -143,7 +149,7 @@ function GroupPageController($scope, $http, $sce, $interval, $location, collecti
$scope.fileSelector.config.columns.push({ field: 'compression', label: 'Compression', width: '6%' });
$scope.groupNode = new QueryNode($scope.group.uri, 'databus:group');
- $scope.groupNode.setFacet('http://purl.org/dc/terms/hasVersion', '$latest', true);
+ $scope.groupNode.setFacet('http://purl.org/dc/terms/hasVersion', DatabusConstants.FACET_LATEST_VERSION_VALUE, true);
$scope.onFacetSettingsChanged = function () {
$scope.fileSelector.query = QueryBuilder.build({
@@ -309,7 +315,7 @@ function GroupPageController($scope, $http, $sce, $interval, $location, collecti
var result = response.data.docs[r];
for (var artifact of $scope.artifacts) {
- if (result.resource[0] == artifact.uri) {
+ if (result.id[0] == artifact.uri) {
$scope.searchResult.push(artifact);
}
}
diff --git a/public/js/page-controller/header-controller.js b/public/js/page-controller/header-controller.js
index e4dfd847..68565892 100644
--- a/public/js/page-controller/header-controller.js
+++ b/public/js/page-controller/header-controller.js
@@ -6,25 +6,21 @@ function HeaderController($scope, $http, collectionManager, searchManager) {
$scope.auth = data.auth;
$scope.authenticated = data.auth.authenticated;
- $scope.accountName = null;
$scope.utils = new DatabusWebappUtils($scope);
+ $scope.accountName = $scope.utils.getAccountName();
- if($scope.authenticated && $scope.auth.info != null) {
- $scope.accountName = $scope.auth.info.accountName;
- }
// Check for cookie settings
$scope.databusCookieConsentKey = 'databus_cookie_consent';
let cookieConsent = window.localStorage.getItem($scope.databusCookieConsentKey);
$scope.showCookieDialogue = cookieConsent === undefined;
+
$scope.collectionManager = collectionManager;
if ($scope.authenticated) {
- // Collection Manager Init
- var loadCollectionsFromServer = $scope.collectionManager.accountName != $scope.auth.info.accountName;
-
- $scope.collectionManager.tryInitialize($scope.auth.info.accountName, loadCollectionsFromServer);
+ $scope.collectionManager.tryInitialize($scope.accountName);
+ // Collection Manager Init
// Initialize search manager
searchManager.initialize();
} else {
diff --git a/public/js/page-controller/profile-controller.js b/public/js/page-controller/profile-controller.js
index e547b5db..c0d97865 100644
--- a/public/js/page-controller/profile-controller.js
+++ b/public/js/page-controller/profile-controller.js
@@ -8,29 +8,37 @@ const AppJsonFormatter = require("../utils/app-json-formatter");
function ProfileController($scope, $http) {
- $scope.profileData = data.profile;
+ $scope.account = data.account;
+ $scope.auth = data.auth;
+
+ if (data.owner != null) {
+ $scope.account.apiKeys = data.owner.apiKeys;
+ }
$scope.auth = data.auth;
$scope.preferredDatabusUsername = "";
- $scope.apiKeys = data.auth.info.apiKeys;
$scope.createApiKeyName = ""
$scope.createAccountError = "";
$scope.createApiKeyError = "";
$scope.addWebIdUri = "";
+ $scope.deleteAccountName = "";
$scope.grantAccessUri = "";
$scope.adapters = SearchAdapter.list;
$scope.utils = new DatabusWebappUtils($scope);
- $scope.personUri = `${DATABUS_RESOURCE_BASE_URL}/${$scope.auth.info.accountName}${DatabusConstants.WEBID_THIS}`;
+ $scope.accountName = $scope.utils.getAccountName();
+
+ $scope.personUri = `${DATABUS_RESOURCE_BASE_URL}/${$scope.accountName}${DatabusConstants.WEBID_THIS}`;
$scope.putProfile = function (accountName) {
- var accountJsonLd = AppJsonFormatter.createAccountData(DATABUS_RESOURCE_BASE_URL,
+ var accountUri = `${DATABUS_RESOURCE_BASE_URL}/${accountName}`;
+ var accountJsonLd = AppJsonFormatter.createAccountData(
+ accountUri,
accountName,
- accountName,
- null,
+ null,
null);
- $http.put(`/${accountName}`, accountJsonLd).then(function (result) {
+ $http.post(`/api/register`, accountJsonLd).then(function (result) {
window.location.reload(true);
}, function (err) {
console.log(err);
@@ -39,9 +47,16 @@ function ProfileController($scope, $http) {
}
- if ($scope.profileData == undefined) {
+ if ($scope.account == undefined) {
$scope.createProfile = function () {
+
+ if ($scope.isSubmitting) {
+ return;
+ }
+
+ $scope.isSubmitting = true;
+
if (!$scope.auth.authenticated) {
return;
}
@@ -61,55 +76,122 @@ function ProfileController($scope, $http) {
return;
}
- $scope.removeApiKey = function (key) {
+ $scope.addApiKey = async function () {
+ // Validate the name input only
- $http.post(`/api/account/api-key/delete?name=${key.keyname}`).then(function (result) {
- $scope.apiKeys = $scope.apiKeys.filter(function (k) {
- return k.keyname != key.keyname;
- });
+ if (!$scope.createApiKeyName) {
+ DatabusAlert.alert("API key name must be provided.");
+ return;
+ }
- }, function (err) {
- console.log(err);
- $scope.createApiKeyError = err.data;
- });
- }
+ let account = $scope.account;
- $scope.onCreateApiKeyNameChanged = function () {
- var hasError = !DatabusUtils.isValidResourceLabel($scope.createApiKeyName, 3, 20);
- $scope.createApiKeyError = hasError ? " API key name must have between 3 and 20 characters and match [A-Za-z0-9\\s_()\\.\\,\\-]*" : "";
- }
+ const postData = {
+ accountName: account.accountName,
+ keyname: $scope.createApiKeyName
+ };
- $scope.addApiKey = function () {
+ try {
+ // Send POST request to create the API key
+ let response = await $http.post('/api/account/api-key/create', postData);
- $http.post(`/api/account/api-key/create?name=${encodeURIComponent($scope.createApiKeyName)}`).then(function (result) {
+ if (response.data && response.data.apikey && response.data.keyname) {
+ // Append new key to the list
+ account.apiKeys.push({
+ keyname: response.data.keyname,
+ apikey: response.data.apikey
+ });
+
+ // Clear the name input field
+ $scope.createApiKeyName = '';
- if (result.data != null) {
- $scope.apiKeys.push(result.data);
+ DatabusAlert.alert($scope, true, "API key created.");
+ } else {
+ DatabusAlert.alert($scope, false, "Failed to create API key.");
}
- DatabusAlert.alert($scope, true, DatabusMessages.ACCOUNT_API_KEY_CREATED);
+ } catch (error) {
+ console.error('Error creating API key:', error);
+ const message = error.data || error.message || "Unknown error occurred.";
+ DatabusAlert.alert($scope, false, message);
+ }
+ };
- }, function (err) {
- console.log(err);
- $scope.createApiKeyError = err.data;
+
+ $scope.deleteApiKey = async function (apiKey) {
+ try {
+
+ let account = $scope.account;
+ // Find index of the account using accountName
+ const index = account.apiKeys.findIndex(key => key.keyname === apiKey.keyname);
+
+ if (index === -1) {
+ throw new Error(`API key with name "${apiKey.keyname}" not found.`);
+ }
+
+ console.log("Deleting API key with keyname:", apiKey.keyname);
+
+ // Send delete request to server
+ await $http.post(`/api/account/api-key/delete`, { accountName: account.accountName, keyname: apiKey.keyname });
+ account.apiKeys.splice(index, 1);
+
+ // Show success alert
+ DatabusAlert.alert($scope, true, "API key deleted.");
+
+ } catch (err) {
+ console.error(err);
+
+
+
+ const message = err.data || err.message || "Unknown error occurred.";
+ DatabusAlert.alert($scope, false, message);
+ }
+ };
+
+ $scope.addSecretary = function (account) {
+ if (!$scope.editData.secretaries) {
+ $scope.editData.secretaries = [];
+ }
+
+ $scope.editData.secretaries.push({
+ accountName: '',
+ hasWriteAccessTo: []
});
+ };
+
+ $scope.removeSecretary = function (account, index) {
+ $scope.editData.secretaries.splice(index, 1);
+ };
+
+ $scope.addNamespace = function (account, secIndex) {
+ $scope.editData.secretaries[secIndex].hasWriteAccessTo.push('');
+ };
+
+ $scope.removeNamespace = function (account, secIndex, nsIndex) {
+ $scope.editData.secretaries[secIndex].hasWriteAccessTo.splice(nsIndex, 1);
+ };
+
+ $scope.onCreateApiKeyNameChanged = function () {
+ var hasError = !DatabusUtils.isValidResourceLabel($scope.createApiKeyName, 3, 20);
+ $scope.createApiKeyError = hasError ? " API key name must have between 3 and 20 characters and match [A-Za-z0-9\\s_()\\.\\,\\-]*" : "";
}
- $scope.removeSearchExtension = function(uri) {
+
+ $scope.removeSearchExtension = function (uri) {
$http.post(`/api/account/mods/search-extensions/remove?uri=${encodeURIComponent(uri)}`)
- .then(function (result) {
- console.log(result);
- DatabusAlert.alert($scope, true, result.data);
+ .then(function (result) {
+ console.log(result);
+ DatabusAlert.alert($scope, true, result.data);
- $scope.profileData.searchExtensions = $scope.profileData.searchExtensions.filter(function (e) {
- return e.endpointUri != uri;
- });
+ $scope.account.searchExtensions = $scope.account.searchExtensions.filter(function (e) {
+ return e.endpointUri != uri;
+ });
- }, function (err) {
- console.log(err);
- DatabusAlert.alert($scope, false, err.data);
- });
+ }, function (err) {
+ console.log(err);
+ DatabusAlert.alert($scope, false, err.data);
+ });
}
$scope.addSearchExtension = function () {
@@ -120,7 +202,7 @@ function ProfileController($scope, $http) {
.then(function (result) {
console.log(result);
DatabusAlert.alert($scope, true, result.data);
- $scope.profileData.searchExtensions.push({
+ $scope.account.searchExtensions.push({
endpointUri: uri,
adapter: adapter
});
@@ -132,7 +214,7 @@ function ProfileController($scope, $http) {
$scope.grantAccess = function () {
$http.post(`/api/account/access/grant?uri=${encodeURIComponent($scope.grantAccessUri)}`).then(function (result) {
- $scope.profileData.authorizedAccounts.push($scope.grantAccessUri);
+ $scope.account.authorizedAccounts.push($scope.grantAccessUri);
}, function (err) {
console.log(err);
$scope.grantAccessError = err.data;
@@ -141,7 +223,7 @@ function ProfileController($scope, $http) {
$scope.revokeAccess = function (uri) {
$http.post(`/api/account/access/revoke?uri=${encodeURIComponent(uri)}`).then(function (result) {
- $scope.profileData.authorizedAccounts = $scope.profileData.webIds.filter(function (value, index, arr) {
+ $scope.account.authorizedAccounts = $scope.account.webIds.filter(function (value, index, arr) {
return value != uri;
});
}, function (err) {
@@ -153,7 +235,7 @@ function ProfileController($scope, $http) {
$scope.connectWebid = function () {
$http.post(`/api/account/webid/add?uri=${encodeURIComponent($scope.addWebIdUri)}`).then(function (result) {
- $scope.profileData.webIds.push($scope.addWebIdUri);
+ $scope.account.webIds.push($scope.addWebIdUri);
DatabusAlert.alert($scope, true, DatabusMessages.ACCOUNT_WEBID_LINKED);
}, function (err) {
@@ -166,7 +248,7 @@ function ProfileController($scope, $http) {
$http.post(`/api/account/webid/remove?uri=${encodeURIComponent(webIdToRemove)}`).then(function (result) {
- $scope.profileData.webIds = $scope.profileData.webIds.filter(function (value, index, arr) {
+ $scope.account.webIds = $scope.account.webIds.filter(function (value, index, arr) {
return value != webIdToRemove;
});
@@ -177,28 +259,52 @@ function ProfileController($scope, $http) {
}
- $scope.saveProfile = async function () {
+ $scope.deleteAccount = async function () {
+ let account = $scope.account;
+ let name = $scope.deleteAccountName;
+
+ try {
+ let response = await $http.post(`/api/account/delete`, { accountName: name });
+
+ window.location = `/app/user`;
+
+ } catch (err) {
+ console.error(err);
+ DatabusAlert.alert($scope, false, err.data);
+ }
+
+ }
+
+ $scope.updateAccount = async function () {
if (!$scope.auth.authenticated) {
return;
}
- var accountJsonLd = AppJsonFormatter.createAccountData(DATABUS_RESOURCE_BASE_URL,
- $scope.auth.info.accountName,
- $scope.editData.label,
- $scope.editData.about,
- $scope.editData.imageUrl);
+ let account = {};
+ account.uri = $scope.editData.uri;
- $http.put(`/${$scope.auth.info.accountName}`, accountJsonLd).then(function (result) {
- DatabusAlert.alert($scope, true, DatabusMessages.ACCOUT_PROFILE_SAVED);
- }, function (err) {
- console.log(err);
- });
+ account.accountName = $scope.editData.accountName;
+ account.label = $scope.editData.label;
+ account.status = $scope.editData.about;
+ account.imageUrl = $scope.editData.imageUrl;
+ account.secretaries = $scope.editData.secretaries;
+
+
+ try {
+ await $http.post(`/api/account/update`, account);
+ DatabusAlert.alert($scope, true, "Account saved.");
+
+ } catch (err) {
+ console.error(err);
+ DatabusAlert.alert($scope, false, err.data);
+ }
}
- // We have profile data in $scope.profileData!
- if (!$scope.profileData.isOwn) {
+ // We have profile data in $scope.account!
+
+ if (!$scope.account.isOwn) {
return;
}
@@ -207,10 +313,10 @@ function ProfileController($scope, $http) {
$scope.modsSettings.searchExtensionAdapter = $scope.adapters[0];
- $scope.editData = DatabusUtils.createCleanCopy($scope.profileData);
+ $scope.editData = DatabusUtils.createCleanCopy($scope.account);
$scope.resetEdits = function () {
- $scope.editData = DatabusUtils.createCleanCopy($scope.profileData);
+ $scope.editData = DatabusUtils.createCleanCopy($scope.account);
}
}
diff --git a/public/js/page-controller/publish-wizard-controller.js b/public/js/page-controller/publish-wizard-controller.js
index 21df61ae..b857f7e4 100644
--- a/public/js/page-controller/publish-wizard-controller.js
+++ b/public/js/page-controller/publish-wizard-controller.js
@@ -1,8 +1,9 @@
const DatabusWebappUtils = require("../utils/databus-webapp-utils");
const PublishSession = require("../publish/publish-session");
+const TabNavigation = require("../utils/tab-navigation");
// Controller for the header section
-function PublishWizardController($scope, $http, $interval, focus, $q) {
+async function PublishWizardController($scope, $http, $interval, focus, $q, $location) {
$scope.login = function () {
window.location = '/app/login?redirectUrl=' + encodeURIComponent(window.location);
@@ -10,8 +11,18 @@ function PublishWizardController($scope, $http, $interval, focus, $q) {
$scope.utils = new DatabusWebappUtils($scope);
+ $scope.tabNavigation = new TabNavigation($scope, $location, [
+ '', 'group', 'artifact', 'version'
+ ]);
+
+
$scope.createAccount = function () {
- window.location = '/app/account';
+ window.location = '/app/user';
+ }
+
+ // Login function
+ $scope.login = function () {
+ window.location = '/app/login?redirectUrl=' + encodeURIComponent(window.location);
}
$scope.authenticated = data.auth.authenticated;
@@ -29,15 +40,30 @@ function PublishWizardController($scope, $http, $interval, focus, $q) {
return;
}
- $scope.hasAccount = data.auth.info.accountName != undefined;;
+ let accounts = data.auth.info.accounts;
+ $scope.hasAccount = accounts != undefined && accounts.length > 0;
+
+ $scope.accounts = [];
+
+ for(let account of accounts) {
+ $scope.accounts.push({
+ accountName: account.accountName,
+ apiKeys: account.apiKeys
+ });
+ }
if (!$scope.hasAccount) {
return;
}
+ // $scope.session = await PublishSession.createOrResume($http, data.auth.sub, $scope.accounts);
+
+ $scope.session = new PublishSession($http, $interval, $scope.accounts, $scope.apiKeys);
+
+}
/**
* Fetches existing groups and artifacts
- */
+
$scope.getContentForAccount = async function (accountName) {
$scope.isAccountDataLoading = true;
@@ -54,48 +80,24 @@ function PublishWizardController($scope, $http, $interval, focus, $q) {
accountData.publisherUris.push(p.publisherUri);
}
- // Try to resume the session with the account data
- var session = PublishSession.resume($http, accountData);
-
- // Resume failed -> start new session
- if (session == null) {
- session = new PublishSession($http, null, accountData);
- }
+ $scope.session = new PublishSession($http);
- $scope.session = session;
+ /*
$scope.$watch('session', function () {
$scope.session.onChange();
}, true);
$scope.$apply();
+
}
- $scope.getContentForAccount(data.auth.info.accountName);
+ // $scope.getContentForAccount(data.auth.info.accounts[0]);
/**
* LICENSES
- */
+
- $scope.licenseQuery = "";
-
- $interval(function () {
- if ($scope.hasLicenseQueryChanged) {
-
- $http.get(`/app/publish-wizard/licenses?limit=30&keyword=${$scope.licenseQuery}`).then(function(response) {
- $scope.filteredLicenseList = response.data.results.bindings;
- });
-
- $scope.hasLicenseQueryChanged = false;
- }
-
- }, 300);
-
- $scope.filterLicenses = function (licenseQuery) {
- $scope.licenseQuery = licenseQuery;
- $scope.hasLicenseQueryChanged = true;
- }
-
- $scope.filterLicenses("");
+
$scope.addFile = function (input) {
@@ -166,10 +168,11 @@ function PublishWizardController($scope, $http, $interval, focus, $q) {
});
}
+
$scope.customPublish = async function () {
var options = {}
options.headers = {
- 'Accept': 'application/json, text/plain, */*',
+ 'Accept': 'application/json, text/plain',
'Content-Type': 'application/json',
}
@@ -190,7 +193,7 @@ function PublishWizardController($scope, $http, $interval, focus, $q) {
$scope.publish = async function () {
var options = {}
options.headers = {
- 'Accept': 'application/json, text/plain, */*',
+ 'Accept': 'application/json, text/plain',
'Content-Type': 'application/json',
}
@@ -204,8 +207,9 @@ function PublishWizardController($scope, $http, $interval, focus, $q) {
$scope.isPublishing = false;
console.log(err);
});
- }
-}
+ } */
+
+
module.exports = PublishWizardController;
\ No newline at end of file
diff --git a/public/js/page-controller/sparql-editor-controller.js b/public/js/page-controller/sparql-editor-controller.js
index c14cd051..cc6357c5 100644
--- a/public/js/page-controller/sparql-editor-controller.js
+++ b/public/js/page-controller/sparql-editor-controller.js
@@ -2,7 +2,7 @@ var DatabusWebappUtils = require("../utils/databus-webapp-utils");
const SparqlExamples = require("../utils/sparql-examples");
// Controller for the header section
-function SparqlEditorController($scope, $http) {
+function SparqlEditorController($scope, $http, $location) {
$scope.storageKey = `${DATABUS_RESOURCE_BASE_URL}/sparql`;
@@ -15,22 +15,38 @@ function SparqlEditorController($scope, $http) {
$scope.editor = {};
+
+ $scope.$on('$locationChangeSuccess', function () {
+ var hash = $location.hash();
+
+ if (hash && hash.startsWith('query')) {
+ var tabIndex = parseInt(hash.replace('query', '')) - 1;
+
+ // Only change if the tab exists and is different from current
+ if (!isNaN(tabIndex) &&
+ tabIndex >= 0 &&
+ tabIndex < $scope.queryData.pages.length &&
+ $scope.queryData.activeTab !== tabIndex) {
+ $scope.goToTab(tabIndex);
+ $scope.$applyAsync();
+ }
+ }
+ });
+
$scope.editor.exampleQueries = {};
$scope.editor.exampleQueries.label = "Databus Example Queries";
$scope.editor.exampleQueries.children = [];
var simpleQueries = {
label: "Simple Queries",
- children : []
+ children: []
};
-
var intermediateQueries = {
label: "Intermediate Queries",
- children : []
+ children: []
};
-
simpleQueries.children.push({
label: "Select all Databus Groups",
query: `PREFIX databus:
@@ -113,9 +129,9 @@ ORDER BY DESC (STR(?v)) LIMIT 1`
$scope.editor.exampleQueries.children.push(simpleQueries);
$scope.editor.exampleQueries.children.push(intermediateQueries);
- $scope.onExampleQueryClicked = function(node) {
+ $scope.onExampleQueryClicked = function (node) {
- if(node.query == null) {
+ if (node.query == null) {
return;
}
@@ -131,6 +147,9 @@ ORDER BY DESC (STR(?v)) LIMIT 1`
$scope.queryData.activeTab = index;
$scope.saveToStorage();
+ $location.hash(`query${index + 1}`);
+
+
var queryPage = $scope.queryData.pages[$scope.queryData.activeTab];
if ($scope.resultCache != null && $scope.resultCache[queryPage.name] != null) {
@@ -244,27 +263,47 @@ ORDER BY DESC (STR(?v)) LIMIT 1`
}
}
+
+
catch (e) {
// Could not parse query data, create new!
$scope.initialize();
}
+ var initialHash = $location.hash();
+ if (initialHash && initialHash.startsWith('query')) {
+ var initialTab = parseInt(initialHash.replace('query', '')) - 1;
+ if (!isNaN(initialTab) &&
+ initialTab >= 0 &&
+ initialTab < $scope.queryData.pages.length) {
+ $scope.queryData.activeTab = initialTab;
+ }
+ }
+
$scope.editor.query = $scope.editor.exampleQueries[0];
$scope.send = async function () {
var queryPage = $scope.queryData.pages[$scope.queryData.activeTab];
- var res = await $http.post(queryPage.endpoint, { query: queryPage.query });
+ try {
- if ($scope.resultCache == null) {
- $scope.resultCache = {};
- }
+ var res = await $http.post(queryPage.endpoint, { query: queryPage.query });
- $scope.resultCache[queryPage.name] = res.data;
- $scope.saveResultCache();
+ if ($scope.resultCache == null) {
+ $scope.resultCache = {};
+ }
+
+ $scope.resultCache[queryPage.name] = res.data;
+ $scope.saveResultCache();
+
+ delete queryPage.err;
+ $scope.editor.result = res.data;
+ } catch (err) {
+ console.log(err);
+ queryPage.err = err;
+ }
- $scope.editor.result = res.data;
$scope.$apply();
}
diff --git a/public/js/page-controller/user-settings-controller.js b/public/js/page-controller/user-settings-controller.js
new file mode 100644
index 00000000..1f8ddc58
--- /dev/null
+++ b/public/js/page-controller/user-settings-controller.js
@@ -0,0 +1,259 @@
+const DatabusAlert = require("../components/databus-alert/databus-alert");
+const DatabusUris = require("../utils/databus-uris");
+const DatabusUtils = require("../utils/databus-utils");
+const JsonldUtils = require("../utils/jsonld-utils");
+const TabNavigation = require("../utils/tab-navigation");
+
+function UserSettingsController($scope, $http, $sce, $location) {
+ $scope.auth = data.auth;
+ $scope.accounts = data.accounts;
+
+ $scope.inputs = {};
+
+ $scope.inputs.newAccountLabel = "";
+ $scope.inputs.newAccountName = "";
+ $scope.inputs.newApiKeyName = "";
+
+ $scope.tabNavigation = new TabNavigation($scope, $location, [
+ ''
+ ], function (index) {
+ $scope.activeAccount = $scope.accounts[index - 1];
+ });
+
+ $scope.$watchCollection('accounts', function (newAccounts) {
+ const accountNames = newAccounts.map(a => a.accountName);
+ $scope.tabNavigation.tabKeys = [''].concat(accountNames);
+
+ const currentHash = $location.hash();
+
+ $scope.tabNavigation.onLocationHashChanged(currentHash, currentHash)
+
+ if (currentHash && !$scope.tabNavigation.tabKeys.includes(currentHash)) {
+ $location.hash('');
+ }
+ });
+
+ // Iterate over each account and load its data
+ $scope.accounts.forEach(function (account) {
+ // Set loading state
+ account.loading = true;
+
+ var requestParams = {
+ method: 'GET',
+ url: '/' + encodeURIComponent(account.accountName),
+ headers: {
+ 'Accept': 'application/ld+json',
+ 'X-Jsonld-Formatting': 'flatten'
+ }
+ }
+
+ // Perform HTTP GET request to fetch additional data
+ $http(requestParams)
+ .then(function (response) {
+ // Set loading to false when data is received
+ account.loading = false;
+
+ // Store additional info (stub)
+ var graphs = response.data;
+ var personGraph = JsonldUtils.getTypedGraph(graphs, DatabusUris.FOAF_PERSON);
+
+ account.uri = `${DATABUS_RESOURCE_BASE_URL}/${account.accountName}`;
+ account.label = JsonldUtils.getFirstProperty(personGraph, DatabusUris.FOAF_NAME);
+ account.status = JsonldUtils.getFirstProperty(personGraph, DatabusUris.FOAF_STATUS);
+ account.imageUrl = JsonldUtils.getProperty(personGraph, DatabusUris.FOAF_IMG);
+ account.secretaries = [];
+
+ let accountGraph = JsonldUtils.getTypedGraph(graphs, DatabusUris.DATABUS_ACCOUNT);
+ let secretaryIds = JsonldUtils.getRefArrayProperty(accountGraph, DatabusUris.DATABUS_SECRETARY_PROPERTY);
+
+ for (let secretaryId of secretaryIds) {
+ let secretaryGraph = JsonldUtils.getGraphById(graphs, secretaryId);
+
+ let secretary = {};
+ secretary.accountName = DatabusUtils.uriToName(JsonldUtils.getProperty(secretaryGraph, DatabusUris.DATABUS_ACCOUNT_PROPERTY));
+ secretary.hasWriteAccessTo = JsonldUtils.getRefArrayProperty(secretaryGraph, DatabusUris.DATABUS_HAS_WRITE_ACCESS_TO);
+
+ account.secretaries.push(secretary);
+ }
+
+ })
+ .catch(function (error) {
+ // Handle error and set loading to false
+ account.loading = false;
+ console.error('Failed to load account data for', account.name, error);
+ });
+ });
+
+ // Button click handler to add account
+ $scope.addAccount = async function () {
+
+ try {
+
+ await $http.post(`/api/account/create`, {
+ name: $scope.inputs.newAccountName,
+ label: $scope.inputs.newAccountLabel
+ });
+
+ $scope.accounts.push({
+ label: $scope.inputs.newAccountLabel,
+ accountName: $scope.inputs.newAccountName,
+ uri: `${DATABUS_RESOURCE_BASE_URL}/${$scope.inputs.newAccountName}`
+ });
+
+ DatabusAlert.alert($scope, true, "Account created.");
+
+ } catch (err) {
+ console.error(err);
+ DatabusAlert.alert($scope, false, err.data);
+ }
+ };
+
+ // Button click handler to save account
+ $scope.saveAccount = async function (account) {
+ try {
+ await $http.post(`/api/account/update`, account);
+ DatabusAlert.alert($scope, true, "Account saved.");
+
+ } catch (err) {
+ console.error(err);
+ DatabusAlert.alert($scope, false, err.data);
+ }
+
+ };
+
+ // Button click handler to delete account
+ $scope.deleteAccount = async function (account) {
+ try {
+ // Find index of the account using accountName
+ const index = $scope.accounts.findIndex(acc => acc.accountName === account.accountName);
+
+ if (index === -1) {
+ throw new Error(`Account with name "${account.accountName}" not found.`);
+ }
+
+ console.log("Deleting account with accountName:", account.accountName);
+
+ // Send delete request to server
+ await $http.post(`/api/account/delete`, account);
+
+ // Show success alert
+ DatabusAlert.alert($scope, true, "Account deleted.");
+
+ // Remove account from local array
+ $scope.accounts.splice(index, 1);
+
+ } catch (err) {
+ console.error(err);
+ const message = err.data || err.message || "Unknown error occurred.";
+ DatabusAlert.alert($scope, false, message);
+ }
+ };
+
+
+
+
+ $scope.goToUserSettings = function (accountName) {
+ window.location.href = '/' + encodeURIComponent(accountName) + '#settings';
+ }
+
+ $scope.addWriteAccessUrl = function (account) {
+ account.writeAccess.push('');
+ };
+
+ $scope.removeWriteAccessUrl = function (account, index) {
+ account.writeAccess.splice(index, 1);
+ };
+
+ $scope.addApiKey = async function (account) {
+ // Validate the name input only
+
+ if (!$scope.inputs.newApiKeyName) {
+ DatabusAlert.alert("API key name must be provided.");
+ return;
+ }
+
+ const postData = {
+ accountName: account.accountName,
+ name: $scope.inputs.newApiKeyName
+ };
+
+ try {
+ // Send POST request to create the API key
+ let response = await $http.post('/api/account/api-key/create', postData);
+
+ if (response.data && response.data.apikey && response.data.keyname) {
+ // Append new key to the list
+ account.apiKeys.push({
+ keyname: response.data.keyname,
+ apikey: response.data.apikey
+ });
+
+ // Clear the name input field
+ $scope.inputs.newApiKeyName = '';
+
+ DatabusAlert.alert($scope, true, "API key created.");
+ } else {
+ DatabusAlert.alert($scope, false, "Failed to create API key.");
+ }
+
+ } catch (error) {
+ console.error('Error creating API key:', error);
+ const message = err.data || err.message || "Unknown error occurred.";
+ DatabusAlert.alert($scope, false, message);
+ }
+ };
+
+
+ $scope.deleteApiKey = async function (account, apiKey) {
+ try {
+ // Find index of the account using accountName
+ const index = account.apiKeys.findIndex(key => key.keyname === apiKey.keyname);
+
+ if (index === -1) {
+ throw new Error(`API key with name "${apiKey.keyname}" not found.`);
+ }
+
+ console.log("Deleting API key with keyname:", apiKey.keyname);
+
+ // Send delete request to server
+ await $http.post(`/api/account/api-key/delete`, { accountName: account.accountName, keyname: apiKey.keyname });
+ account.apiKeys.splice(index, 1);
+
+ // Show success alert
+ DatabusAlert.alert($scope, true, "API key deleted.");
+
+ } catch (err) {
+ console.error(err);
+
+
+
+ const message = err.data || err.message || "Unknown error occurred.";
+ DatabusAlert.alert($scope, false, message);
+ }
+ };
+
+ $scope.addSecretary = function (account) {
+ if (!account.secretaries) {
+ account.secretaries = [];
+ }
+
+ account.secretaries.push({
+ accountName: '',
+ hasWriteAccessTo: []
+ });
+ };
+
+ $scope.removeSecretary = function (account, index) {
+ account.secretaries.splice(index, 1);
+ };
+
+ $scope.addNamespace = function (account, secIndex) {
+ account.secretaries[secIndex].hasWriteAccessTo.push('');
+ };
+
+ $scope.removeNamespace = function (account, secIndex, nsIndex) {
+ account.secretaries[secIndex].hasWriteAccessTo.splice(nsIndex, 1);
+ };
+}
+
+module.exports = UserSettingsController;
\ No newline at end of file
diff --git a/public/js/page-controller/version-controller.js b/public/js/page-controller/version-controller.js
index 23275527..4d7b0540 100644
--- a/public/js/page-controller/version-controller.js
+++ b/public/js/page-controller/version-controller.js
@@ -17,7 +17,10 @@ function VersionPageController($scope, $http, $sce, $location, collectionManager
'files', 'mods', 'edit'
]);
+ $scope.auth = data.auth;
$scope.utils = new DatabusWebappUtils($scope, $sce);
+ $scope.accountName = $scope.utils.getAccountName();
+
$scope.collectionManager = collectionManager;
$scope.authenticated = data.auth.authenticated;
$scope.versionGraph = data.graph;
@@ -28,7 +31,7 @@ function VersionPageController($scope, $http, $sce, $location, collectionManager
$scope.collectionModalVisible = false;
$scope.publisherName = DatabusUtils.uriToName(DatabusUtils.navigateUp($scope.version.uri, 3));
- $scope.canEdit = $scope.publisherName == data.auth.info.accountName;
+ $scope.canEdit = $scope.accountName != null;
if (data.auth.authenticated && $scope.canEdit) {
@@ -135,8 +138,7 @@ function VersionPageController($scope, $http, $sce, $location, collectionManager
$scope.formData.version.wasDerivedFrom);
}
- var relativeUri = new URL($scope.version.uri).pathname;
- var response = await $http.put(relativeUri, graphs);
+ var response = await $http.put(`/api/register`, graphs);
if (response.status == 200) {
$scope.version.title = $scope.formData.version.title;
@@ -167,6 +169,7 @@ function VersionPageController($scope, $http, $sce, $location, collectionManager
$scope.fileSelector = {};
$scope.fileSelector.config = {};
+ $scope.fileSelector.config.authenticated = $scope.authenticated;
$scope.fileSelector.config.columns = [];
$scope.fileSelector.config.columns.push({ field: 'variant', label: 'Variant', width: '45%' });
$scope.fileSelector.config.columns.push({ field: 'format', label: 'Format', width: '15%' });
@@ -246,7 +249,7 @@ function VersionPageController($scope, $http, $sce, $location, collectionManager
return DatabusUtils.uriToName(uri);
}
- $scope.downloadMetadataAsFile = async function() {
+ $scope.downloadMetadataAsFile = async function () {
var response = await $http({
method: 'GET',
url: $scope.version.uri,
@@ -258,15 +261,15 @@ function VersionPageController($scope, $http, $sce, $location, collectionManager
$scope.download(`${$scope.version.name}.jsonld`, JSON.stringify(response.data, null, 3));
}
- $scope.download = function(filename, text) {
+ $scope.download = function (filename, text) {
var element = document.createElement('a');
element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(text));
element.setAttribute('download', filename);
element.style.display = 'none';
document.body.appendChild(element);
-
+
element.click();
-
+
document.body.removeChild(element);
}
diff --git a/public/js/publish/artifact-data.js b/public/js/publish/artifact-data.js
new file mode 100644
index 00000000..1428e595
--- /dev/null
+++ b/public/js/publish/artifact-data.js
@@ -0,0 +1,110 @@
+const EntityHandler = require('./entity-handler');
+const DatabusUtils = require('../utils/databus-utils');
+const DatabusUris = require('../utils/databus-uris');
+const GroupData = require('./group-data');
+
+class ArtifactData extends EntityHandler {
+ constructor($http, accounts, apiKeys) {
+ super('databus_registration_artifact_data', $http, null, accounts, apiKeys);
+ }
+
+ initialize(data) {
+ const validAccount = data && this.accounts.some(acc => acc.accountName === data.accountName);
+
+ if (validAccount) {
+ Object.assign(this, data);
+ } else {
+ this.accountName = this.accounts[0]?.name;
+ }
+
+ if(this.apiKeyName == null && this.apiKeys != null && this.apiKeys.length > 0) {
+ this.apiKeyName = this.apiKeys[0].keyname;
+ }
+
+
+ this.sendmode ??= 'register';
+ this.onAccountNameChanged();
+ this.onGroupNameChanged();
+ }
+
+ validate() {
+ this.errors = [];
+ this.warnings = [];
+
+ if (!DatabusUtils.isValidArtifactName(this.name)) {
+ this.errors.push('err_invalid_artifact_name');
+ }
+
+ if (!DatabusUtils.isValidGroupName(this.groupName)) {
+ this.errors.push('err_no_group_selected');
+ }
+
+ const exists = this.artifactList?.some(a => a.name === this.name);
+ if (exists) {
+ this.warnings.push('warning_artifact_exists');
+ }
+ }
+
+ getURI() {
+ return `${DATABUS_RESOURCE_BASE_URL}/${this.accountName}/${this.groupName}/${this.name}`;
+ }
+
+ getSaveData() {
+ return {
+ accountName: this.accountName,
+ groupName: this.groupName,
+ name: this.name,
+ title: this.title,
+ abstract: this.abstract,
+ description: this.description,
+ sendmode: this.sendmode,
+ apiKeyName: this.apiKeyName,
+ };
+ }
+
+
+ async setGroupName(groupName) {
+ if (this.groupName !== groupName) {
+ this.groupName = groupName;
+ await this.onGroupNameChanged();
+ }
+ }
+
+ async onGroupNameChanged() {
+ this.isLoadingArtifacts = true;
+ this.artifactList = await this.sparqlClient.getArtifacts(this.accountName, this.groupName);
+ this.isLoadingArtifacts = false;
+ this.onChange();
+ }
+
+
+
+ updateOutputs() {
+ const groupUri = `${DATABUS_RESOURCE_BASE_URL}/${GroupData.getStringOrMissing(this.accountName)}/${GroupData.getStringOrMissing(this.groupName)}`;
+
+ this.postBody = {
+ "@context": this.getContext(),
+ "@graph": [
+ {
+ "@id": `${groupUri}/${GroupData.getStringOrMissing(this.name)}`,
+ "@type": "Artifact",
+ "title": this.getValidString(this.title),
+ "abstract": this.getValidString(this.abstract),
+ "description": this.getValidString(this.description),
+ }
+ ]
+ };
+
+ const payload = JSON.stringify(this.postBody, null, 2);
+ const apiKey = this.apiKeys?.find(k => k.keyname === this.apiKeyName)?.apikey;
+
+ this.curlCommand = [
+ `curl -X POST ${DATABUS_RESOURCE_BASE_URL}/api/register \\`,
+ ` -H "X-API-KEY: ${GroupData.getStringOrMissing(apiKey)}" \\`,
+ ` -H "Content-Type: application/json" \\`,
+ ` -d '${payload}'`
+ ].join('\n');
+ }
+}
+
+module.exports = ArtifactData;
diff --git a/public/js/publish/databus-sparql-client.js b/public/js/publish/databus-sparql-client.js
new file mode 100644
index 00000000..c014598e
--- /dev/null
+++ b/public/js/publish/databus-sparql-client.js
@@ -0,0 +1,92 @@
+class DatabusSparqlClient {
+
+ constructor($http) {
+ this.$http = $http;
+ }
+
+ /**
+ * Generic SPARQL query runner.
+ * @param {string} query - SPARQL query string.
+ * @returns {Promise} - Query result bindings.
+ */
+ async runQuery(query) {
+ const config = {
+ method: 'POST',
+ url: `/sparql`,
+ headers: {
+ 'Accept': 'application/sparql-results+json',
+ 'Content-Type': 'application/x-www-form-urlencoded'
+ },
+ data: `query=${encodeURIComponent(query)}`
+ };
+
+ try {
+ const response = await this.$http(config);
+ return response.data.results.bindings || [];
+ } catch (err) {
+ console.error('SPARQL query failed:', err);
+ return [];
+ }
+ }
+
+ /**
+ * Fetches groups for a given Databus account.
+ * @param {string} accountName - The account name (e.g., 'myaccount').
+ * @returns {Promise} - List of groups with basic metadata.
+ */
+ async getGroups(accountName) {
+ const query = `
+ PREFIX databus:
+
+ SELECT DISTINCT ?group WHERE {
+ ?group a databus:Group .
+ ?group databus:account <${DATABUS_RESOURCE_BASE_URL}/${accountName}> .
+ }
+ `;
+
+ const bindings = await this.runQuery(query);
+
+ return bindings.map(binding => ({
+ uri: binding.group.value,
+ name: binding.group.value.split('/').pop(),
+ }));
+ }
+
+ async getArtifacts(accountName, groupName) {
+ const query = `
+ PREFIX databus:
+
+ SELECT DISTINCT ?group WHERE {
+ ?group a databus:Artifact .
+ ?group databus:group <${DATABUS_RESOURCE_BASE_URL}/${accountName}/${groupName}> .
+ }
+ `;
+
+ const bindings = await this.runQuery(query);
+
+ return bindings.map(binding => ({
+ uri: binding.group.value,
+ name: binding.group.value.split('/').pop(),
+ }));
+ }
+
+ async getVersions(accountName, groupName, artifactName) {
+ const query = `
+ PREFIX databus:
+
+ SELECT DISTINCT ?group WHERE {
+ ?group a databus:Version .
+ ?group databus:artifact <${DATABUS_RESOURCE_BASE_URL}/${accountName}/${groupName}/${artifactName}> .
+ }
+ `;
+
+ const bindings = await this.runQuery(query);
+
+ return bindings.map(binding => ({
+ uri: binding.group.value,
+ name: binding.group.value.split('/').pop(),
+ }));
+ }
+}
+
+module.exports = DatabusSparqlClient;
diff --git a/public/js/publish/entity-handler.js b/public/js/publish/entity-handler.js
new file mode 100644
index 00000000..97e1d0e6
--- /dev/null
+++ b/public/js/publish/entity-handler.js
@@ -0,0 +1,146 @@
+const DatabusUris = require("../utils/databus-uris");
+const DatabusUtils = require("../utils/databus-utils");
+const DatabusSparqlClient = require("./databus-sparql-client");
+
+class EntityHandler {
+ constructor(storageKey, $http, $interval, accounts, apiKeys) {
+ this.storageKey = storageKey;
+ this.$http = $http;
+ this.$interval = $interval;
+ this.accounts = accounts;
+ this.apiKeys = apiKeys;
+ this.sparqlClient = new DatabusSparqlClient($http);
+
+ const data = this._loadFromSession();
+ this.initialize(data);
+ }
+
+ _loadFromSession() {
+ try {
+ const raw = window.sessionStorage.getItem(this.storageKey);
+ return raw ? JSON.parse(raw) : null;
+ } catch (e) {
+ console.error("Failed to load session data:", e);
+ return null;
+ }
+ }
+
+ save() {
+ try {
+ const data = this.getSaveData();
+ const json = JSON.stringify(data);
+ window.sessionStorage.setItem(this.storageKey, json);
+ } catch (e) {
+ console.error("Failed to save session data:", e);
+ }
+ }
+
+ // Abstract methods
+ initialize(data) {
+ throw new Error("Method 'initialize(data)' must be implemented.");
+ }
+
+ getSaveData() {
+ throw new Error("Method 'getSaveData()' must be implemented.");
+ }
+
+ validate() {
+ throw new Error("Method 'validate()' must be implemented.");
+ }
+
+ updateOutputs() {
+ throw new Error("Method 'updateOutputs()' must be implemented.");
+ }
+
+ getURI() {
+ throw new Error("Method 'updateOutputs()' must be implemented.");
+ }
+
+ getValidString(value) {
+ return value?.length > 0 ? value : undefined;
+ }
+
+ static getStringOrMissing(value) {
+ return value?.length > 0 ? value : '!!!missing!!!';
+ }
+
+ hasError(errorKey) {
+ return this.errors?.includes(errorKey) ?? false;
+ }
+
+ setSendMode(sendmode) {
+ this.sendmode = sendmode;
+ this.onChange();
+ }
+
+ getContext() {
+ if (DATABUS_CONTEXT_URL && DatabusUtils.isValidHttpUrl(DATABUS_CONTEXT_URL)) {
+ return DATABUS_CONTEXT_URL;
+ }
+ return DATABUS_CONTEXT[DatabusUris.JSONLD_CONTEXT];
+ }
+
+ async setAccountName(accountName) {
+ if (this.accountName !== accountName) {
+ this.accountName = accountName;
+ await this.onAccountNameChanged();
+ }
+ }
+
+ async onAccountNameChanged() {
+ this.isLoadingGroups = true;
+ this.groupList = await this.sparqlClient.getGroups(this.accountName);
+ this.isLoadingGroups = false;
+ this.onChange();
+ }
+
+ async setAccountName(accountName) {
+ if (this.accountName !== accountName) {
+ this.accountName = accountName;
+
+ this.activeAccount = this.accounts?.find(a => a.accountName === this.accountName);
+ await this.onAccountNameChanged();
+ }
+ }
+
+ getAccount() {
+ return this.activeAccount;
+
+ }
+
+ onChange() {
+ this.updateOutputs();
+ this.validate();
+ this.save();
+ }
+
+ getApiKey() {
+ return this.getAccount()?.apiKeys?.find(k => k.keyname === this.apiKeyName)?.apikey;
+ }
+
+ setApiKeyName(keyname) {
+ this.apiKeyName = keyname;
+ this.onChange();
+ }
+
+ async register() {
+ try {
+ const response = await this.$http({
+ method: 'POST',
+ url: `/api/register?log-level=info`,
+ headers: {
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/json'
+ },
+ data: this.postBody
+ });
+
+ return response;
+ } catch (err) {
+ console.error('Entity registration failed:', err);
+ throw err;
+ }
+ }
+}
+
+module.exports = EntityHandler;
diff --git a/public/js/publish/group-data.js b/public/js/publish/group-data.js
new file mode 100644
index 00000000..a76f582f
--- /dev/null
+++ b/public/js/publish/group-data.js
@@ -0,0 +1,91 @@
+const EntityHandler = require('./entity-handler');
+const DatabusUtils = require('../utils/databus-utils');
+const DatabusUris = require('../utils/databus-uris');
+const DatabusSparqlClient = require('./databus-sparql-client');
+
+class GroupData extends EntityHandler {
+ constructor($http, accounts, apiKeys) {
+ super('databus_registration_group_data', $http, null, accounts, apiKeys);
+
+ }
+
+ initialize(data) {
+ const validAccount = data && this.accounts.some(acc => acc.accountName === data.accountName);
+
+ if (validAccount) {
+ Object.assign(this, data);
+ } else {
+ this.accountName = this.accounts[0]?.name;
+ }
+
+ if(this.apiKeyName == null && this.apiKeys != null && this.apiKeys.length > 0) {
+ this.apiKeyName = this.apiKeys[0].keyname;
+ }
+
+ this.sendmode ??= 'register';
+ this.onAccountNameChanged();
+ }
+
+ getSaveData() {
+ return {
+ accountName: this.accountName,
+ name: this.name,
+ title: this.title,
+ abstract: this.abstract,
+ description: this.description,
+ sendmode: this.sendmode,
+ apiKeyName: this.apiKeyName,
+ };
+ }
+
+ getURI() {
+ return `${DATABUS_RESOURCE_BASE_URL}/${this.accountName}/${this.name}`;
+ }
+
+ validate() {
+ this.errors = [];
+ this.warnings = [];
+
+ if (!DatabusUtils.isValidGroupName(this.name)) {
+ this.errors.push('err_invalid_group_name');
+ }
+
+ if(this.sendmode == 'curl' && !this.apiKeyName) {
+ this.errors.push('err_no_api_key');
+ }
+
+ const exists = this.groupList?.some(g => g.name === this.name);
+ if (exists) {
+ this.warnings.push('warning_group_exists');
+ }
+ }
+
+ updateOutputs() {
+ const accountUri = `${DATABUS_RESOURCE_BASE_URL}/${GroupData.getStringOrMissing(this.accountName)}`;
+
+ this.postBody = {
+ "@context": this.getContext(),
+ "@graph": [
+ {
+ "@id": `${accountUri}/${GroupData.getStringOrMissing(this.name)}`,
+ "@type": "Group",
+ "title": this.getValidString(this.title),
+ "abstract": this.getValidString(this.abstract),
+ "description": this.getValidString(this.description),
+ }
+ ]
+ };
+
+ const payload = JSON.stringify(this.postBody, null, 2);
+ const apiKey = this.getApiKey();
+
+ this.curlCommand = [
+ `curl -X POST ${DATABUS_RESOURCE_BASE_URL}/api/register \\`,
+ ` -H "X-API-KEY: ${GroupData.getStringOrMissing(apiKey)}" \\`,
+ ` -H "Content-Type: application/json" \\`,
+ ` -d '${payload}'`
+ ].join('\n');
+ }
+}
+
+module.exports = GroupData;
diff --git a/public/js/publish/publish-data.js b/public/js/publish/publish-data.js
index 93913c85..b0e0723d 100644
--- a/public/js/publish/publish-data.js
+++ b/public/js/publish/publish-data.js
@@ -5,16 +5,26 @@ const DatabusUtils = require("../utils/databus-utils");
*/
class PublishData {
- constructor(data, accountData) {
-
- this.accountData = accountData;
- this.group = data != undefined ? data.group : {};
- this.artifact = data != undefined ? data.artifact : {};
- this.version = data != undefined ? data.version : {};
- this.files = data != undefined ? data.files : {};
- this.signature = data != undefined ? data.signature : undefined;
+ constructor(data) {
+
+ if (data != null) {
+ this.account = data.account ?? {};
+ this.group = data.group ?? {};
+ this.artifact = data.artifact ?? {};
+ this.version = data.version ?? {};
+ this.files = data.files ?? {};
+ this.signature = data.signature;
+ }
if (data == null) {
+
+ this.account = {};
+ this.group = {};
+ this.artifact = {};
+ this.version = {};
+ this.files = {};
+ this.signature = undefined;
+
this.group.generateMetadata = 'create';
this.group.generateAbstract = true;
this.artifact.generateMetadata = 'create';
@@ -30,8 +40,8 @@ class PublishData {
var signature = {};
signature.publisherUris = [];
- signature.publisherUris = this.accountData.publisherUris;
- signature.defaultPublisherUri = `${DATABUS_RESOURCE_BASE_URL}/${this.accountData.accountName}#this`
+ signature.publisherUris = this.account.publisherUris;
+ signature.defaultPublisherUri = `${DATABUS_RESOURCE_BASE_URL}/${this.account.accountName}#this`
signature.selectedPublisherUri = signature.defaultPublisherUri;
signature.autoGenerateSignature = true;
signature.autoGenerateSignatureLocked = false;
@@ -43,6 +53,16 @@ class PublishData {
hasError(error) {
}
+
+ clearErrors() {
+ this.group.errors = [];
+ this.artifact.errors = [];
+ this.version.errors = [];
+ this.files.errors = [];
+ this.group.warnings = [];
+ this.artifact.warnings = [];
+ this.version.warnings = [];
+ }
/**
* Validates the tree
*/
@@ -65,7 +85,7 @@ class PublishData {
var self = this;
- var existingGroup = this.accountData.groups.filter(function (value) {
+ var existingGroup = this.account.groups.filter(function (value) {
return value.name == self.group.name;
});
@@ -73,7 +93,7 @@ class PublishData {
this.group.warnings.push('warning_group_exists');
}
- var existingArtifact = this.accountData.artifacts.filter(function (value) {
+ var existingArtifact = this.account.artifacts.filter(function (value) {
return value.groupName == self.group.name && value.name == self.artifact.name;
});
@@ -109,9 +129,9 @@ class PublishData {
}
}
- var versionUri = `${DATABUS_RESOURCE_BASE_URL}/${this.accountData.accountName}/${this.group.name}/${this.artifact.name}/${this.version.name}`;
+ var versionUri = `${DATABUS_RESOURCE_BASE_URL}/${this.account.accountName}/${this.group.name}/${this.artifact.name}/${this.version.name}`;
- var existingVersion = this.accountData.versions.filter(function (value) {
+ var existingVersion = this.account.versions.filter(function (value) {
return value == versionUri;
});
diff --git a/public/js/publish/publish-session.js b/public/js/publish/publish-session.js
index 8bf4dd4a..f152b08a 100644
--- a/public/js/publish/publish-session.js
+++ b/public/js/publish/publish-session.js
@@ -4,6 +4,10 @@ const DatabusUris = require("../utils/databus-uris");
const JsonldUtils = require("../utils/jsonld-utils");
const PublishData = require("./publish-data");
const DataIdCreator = require("./dataid-creator");
+const DatabusSparqlClient = require("./databus-sparql-client");
+const GroupHandler = require("./group-data");
+const ArtifactHandler = require("./artifact-data");
+const VersionHandler = require("./version-handler");
class PublishSession {
@@ -18,60 +22,49 @@ class PublishSession {
'streamQueue'
];
- constructor($http, session, accountData) {
- this.$http = $http;
- this.accountData = accountData;
-
- for (var group of this.accountData.groups) {
- group.artifacts = this.accountData.artifacts.filter(function (value) {
- return value.groupName == group.name;
- });
- group.hasArtifacts = group.artifacts.length > 0;
- }
-
- this.formData = new PublishData(session != null ? session.formData : null, accountData);
- this.formData.validate();
-
-
- this.initializeField(session, 'showContext', false);
- this.initializeField(session, 'fetchFilesInput', "");
- this.initializeField(session, 'addFileInput', "");
- this.initializeField(session, 'isAccountDataLoading', true);
- this.initializeField(session, 'addFileInput', "");
- this.initializeField(session, 'currentArtifact', null);
- this.initializeField(session, 'currentGroup', null);
+ constructor($http, $interval, accounts, apiKeys) {
+ this.$http = $http;
+ this.accounts = accounts;
+ this.sparqlClient = new DatabusSparqlClient($http);
+ this.formData = new PublishData();
- this.availableGroups = [];
- this.availableArtifacts = [];
- this.availableVersions = [];
+ this.group = new GroupHandler($http, accounts, apiKeys);
+ this.artifact = new ArtifactHandler($http, accounts, apiKeys);
+ this.version = new VersionHandler($http, $interval, accounts, apiKeys);
+ this.reset();
+ }
- this.isGroupLoading = false;
- this.isArtifactLoading = false;
- this.isVersionLoading = false;
- if (session != null) {
- if (session.currentGroup != null) {
- var group = accountData.groups.find(g => g.uri == session.currentGroup.uri);
- this.selectGroup(group);
- }
+ reset() {
+ this.accountData = {};
+ this.groupData = {};
+ this.artifactData = {};
+ this.versionData = {};
+ }
- if (session.currentArtifact != null) {
- var artifact = accountData.artifacts.find(a => a.uri == session.currentArtifact.uri);
- this.selectArtifact(artifact);
- }
- }
+ update() {
+ this.validate();
+ this.save();
+ }
+ async selectAccount(account) {
+ this.accountData = {
+ name: account.name,
+ isValid: true
+ };
- this.dataIdCreator = new DataIdCreator(this.formData, this.accountData.accountName);
- this.inputs = this.dataIdCreator.createInputs();
+ // Fetch groups for account here:
+ this.groups = await this.sparqlClient.getGroups(this.accountData.name);
+
+ this.save();
}
- selectGroup(targetGroup) {
+ async selectGroup(targetGroup) {
if (targetGroup == null) {
return;
@@ -95,6 +88,15 @@ class PublishSession {
}
}
+ createNewGroup() {
+ this.formData.group.name = "";
+ this.formData.group.title = "";
+ this.formData.group.abstract = "";
+ this.formData.group.description = "";
+
+ this.save();
+ }
+
selectArtifact(targetArtifact) {
if (targetArtifact == null) {
return;
@@ -149,7 +151,7 @@ class PublishSession {
var contentVariantGraphs = JsonldUtils.getTypedGraphs(versionData, DatabusUris.RDF_PROPERTY);
- for(var contentVariantGraph of contentVariantGraphs) {
+ for (var contentVariantGraph of contentVariantGraphs) {
var variantName = DatabusUtils.uriToName(contentVariantGraph[DatabusUris.JSONLD_ID]);
self.formData.addContentVariant(variantName);
@@ -163,7 +165,7 @@ class PublishSession {
var fileUri = JsonldUtils.getProperty(fileGraph, DatabusUris.DCAT_DOWNLOAD_URL);
-
+
var file = {
id: fileUri,
@@ -174,11 +176,11 @@ class PublishSession {
contentVariants: {}
}
- for(var contentVariant of version.contentVariants) {
+ for (var contentVariant of version.contentVariants) {
var variantUri = `${DatabusUris.DATABUS_CONTENT_VARIANT_PREFIX}${contentVariant.id}`;
var variantValue = JsonldUtils.getProperty(fileGraph, variantUri);
- if(variantValue != null) {
+ if (variantValue != null) {
file.contentVariants[contentVariant.id] = variantValue;
}
}
@@ -297,8 +299,18 @@ class PublishSession {
}
save() {
+
+ let data = {
+ accountData: this.accountData,
+ groupData: this.groupData,
+ artifactData: this.artifactData,
+ versionData: this.versionData,
+ formData: this.formData,
+ }
+
+
try {
- var sessionDataString = JSON.stringify(this, function (key, value) {
+ var sessionDataString = JSON.stringify(data, function (key, value) {
if (PublishSession.sessionStorageIgnoreKeys.includes(key)) {
return undefined;
}
@@ -311,15 +323,15 @@ class PublishSession {
}
}
- static resume($http, accountData) {
+ static resume($http, sub, accountData) {
var sessionData = JSON.parse(window.sessionStorage.getItem(PublishSession.sessionStorageKey));
- if (sessionData == null || sessionData.accountData == null) {
+ if (sessionData == null || sessionData.sub == null) {
return null;
}
- if (sessionData.accountData.accountName != accountData.accountName) {
+ if (sub != sessionData.sub) {
return null;
}
@@ -329,7 +341,7 @@ class PublishSession {
}
onChange() {
- this.formData.validate();
+ this.validate();
this.inputs = this.dataIdCreator.createInputs();
this.save();
@@ -343,6 +355,86 @@ class PublishSession {
!this.formData.files.errors.length > 0;
}
}
+
+ onChangeGroup() {
+
+ let group = this.formData.group;
+
+ group.errors = [];
+ group.warnings = [];
+
+ if (!DatabusUtils.isValidGroupName(group.name)) {
+ group.errors.push('err_invalid_group_name');
+ }
+
+ var existingGroup = this.groups.filter(function (value) {
+ return value.name == self.group.name;
+ });
+
+ if (existingGroup.length > 0 && group.mode == 'create') {
+ group.warnings.push('warning_group_exists');
+ }
+
+ this.save();
+ }
+
+ getValidString(value) {
+ if (value == undefined || value.length == 0) {
+ return undefined;
+ }
+
+ return value;
+ }
+
+ updateGroupBody() {
+ var accountUri = `${DATABUS_RESOURCE_BASE_URL}/${this.accountData.name}`;
+
+ this.groupBody = {
+ "@context": this.getContext(),
+ "@graph": [
+ {
+ "@id": `${accountUri}/${this.formData.group.name}`,
+ "@type": "Group",
+ "title": this.getValidString(this.formData.group.title),
+ "abstract": this.getValidString(this.formData.group.abstract),
+ "description": this.getValidString(this.formData.group.description)
+ }
+ ]
+ };
+ }
+
+ getContext() {
+ if (DATABUS_CONTEXT_URL != undefined && DatabusUtils.isValidHttpUrl(DATABUS_CONTEXT_URL)) {
+ return DATABUS_CONTEXT_URL;
+ }
+
+ return DATABUS_CONTEXT[DatabusUris.JSONLD_CONTEXT];
+ }
+
+ onChangeArtifact() {
+
+ let artifact = this.formData.artifact;
+
+ artifact.errors = [];
+ artifact.warnings = [];
+
+ if (!DatabusUtils.isValidArtifactName(artifact.name)) {
+ artifact.errors.push('err_invalid_artifact_name');
+ }
+
+ if (this.artifacts != null) {
+ var existingArtifact = this.artifacts.filter(function (value) {
+ return value.name == self.group.name;
+ });
+
+ if (existingArtifact.length > 0 && artifact.mode == 'create') {
+ artifact.warnings.push('warning_group_exists');
+ }
+ }
+
+ this.save();
+
+ }
}
module.exports = PublishSession;
diff --git a/public/js/publish/publish-wizard-strings.js b/public/js/publish/publish-wizard-strings.js
new file mode 100644
index 00000000..e69de29b
diff --git a/public/js/publish/version-handler.js b/public/js/publish/version-handler.js
new file mode 100644
index 00000000..4b6ecd71
--- /dev/null
+++ b/public/js/publish/version-handler.js
@@ -0,0 +1,594 @@
+const EntityHandler = require('./entity-handler');
+const DatabusUtils = require('../utils/databus-utils');
+const DatabusUris = require('../utils/databus-uris');
+const GroupData = require('./group-data');
+
+class VersionHandler extends EntityHandler {
+ constructor($http, $interval, accounts, apiKeys) {
+ super('databus_registration_version_data', $http, $interval, accounts, apiKeys);
+ }
+
+ initialize(data) {
+ const validAccount = data && this.accounts.some(acc => acc.accountName === data.accountName);
+
+ if (validAccount) {
+ Object.assign(this, data);
+ } else {
+ this.accountName = this.accounts[0]?.name;
+ }
+
+ if (this.apiKeyName == null && this.apiKeys != null && this.apiKeys.length > 0) {
+ this.apiKeyName = this.apiKeys[0].keyname;
+ }
+
+ this.pageIndex ??= 0;
+ this.sendmode ??= 'register';
+ this.files ??= [];
+ this.contentVariants ??= [];
+
+ if (!this.contentVariants.some(v => v.id == 'formatExtension')) {
+ this.contentVariants.push({
+ label: 'Format',
+ id: 'formatExtension',
+ custom: false
+ });
+ }
+
+ if (!this.contentVariants.some(v => v.id == 'compression')) {
+ this.contentVariants.push({
+ label: 'Compression',
+ id: 'compression',
+ custom: false
+ });
+ }
+
+ let self = this;
+
+ this.$interval(function () {
+ if (self.hasLicenseQueryChanged) {
+
+ self.$http.get(`/app/publish-wizard/licenses?limit=30&keyword=${self.licenseQuery}`)
+ .then(function (response) {
+ self.filteredLicenseList = response.data.results.bindings;
+ });
+
+ self.hasLicenseQueryChanged = false;
+ }
+
+ }, 300);
+
+ this.licenseQuery = "";
+ this.filterLicenses();
+ this.onAccountNameChanged();
+ this.onGroupNameChanged();
+ this.onArtifactNameChanged();
+ }
+
+ getURI() {
+ return `${DATABUS_RESOURCE_BASE_URL}/${this.accountName}/${this.groupName}/${this.artifactName}/${this.name}`;
+ }
+
+ setLicense(license) {
+ this.license = license;
+ this.onChange();
+ }
+
+ filterLicenses() {
+ this.hasLicenseQueryChanged = true;
+ }
+
+ validate() {
+ this.errors = [];
+ this.warnings = [];
+
+ if (!DatabusUtils.isValidVersionIdentifier(this.name)) {
+ this.errors.push('err_invalid_version_name');
+ }
+
+ if (!DatabusUtils.isValidGroupName(this.groupName)) {
+ this.errors.push('err_no_group_selected');
+ }
+
+ if (!DatabusUtils.isValidArtifactName(this.artifactName)) {
+ this.errors.push('err_no_artifact_selected');
+ }
+
+ if (!DatabusUtils.isValidResourceLabel(this.title)) {
+ this.errors.push('err_invalid_version_title');
+ }
+
+ if (!DatabusUtils.isValidResourceText(this.abstract, 1)) {
+ this.errors.push('err_invalid_version_abstract');
+ }
+
+ if (!DatabusUtils.isValidResourceText(this.description, 1)) {
+ this.errors.push('err_invalid_version_description');
+ }
+
+ if (!DatabusUtils.isValidUrl(this.license)) {
+ this.errors.push('err_invalid_version_license');
+ }
+
+ if (this.files.length == 0) {
+ this.errors.push('err_no_files');
+ }
+
+ for (let file of this.files) {
+ file.errors = [];
+ }
+
+ this.fileErrors = [];
+
+ this.cvSplit(this.files, 0);
+
+ for (let file of this.files) {
+ for (let error of file.errors) {
+ this.errors.push(error);
+ this.fileErrors.push(error);
+ }
+ }
+
+ const exists = this.artifactList?.some(a => a.name === this.name);
+ if (exists) {
+ this.warnings.push('warning_artifact_exists');
+ }
+ }
+
+ getSaveData() {
+ return {
+ accountName: this.accountName,
+ groupName: this.groupName,
+ artifactName: this.artifactName,
+ name: this.name,
+ title: this.title,
+ abstract: this.abstract,
+ description: this.description,
+ sendmode: this.sendmode,
+ apiKeyName: this.apiKeyName,
+ wasDerivedFrom: this.wasDerivedFrom,
+ attribution: this.attribution,
+ license: this.license,
+ pageIndex: this.pageIndex,
+ contentVariants: this.contentVariants,
+ files: this.files
+ };
+ }
+
+
+ async setGroupName(groupName) {
+ if (this.groupName !== groupName) {
+ this.groupName = groupName;
+ await this.onGroupNameChanged();
+ }
+ }
+
+ async onGroupNameChanged() {
+ this.isLoadingArtifacts = true;
+ this.artifactList = await this.sparqlClient.getArtifacts(this.accountName, this.groupName);
+ this.isLoadingArtifacts = false;
+ this.onChange();
+ }
+
+ async setArtifactName(artifactName) {
+ if (this.artifactName !== artifactName) {
+ this.artifactName = artifactName;
+ await this.onArtifactNameChanged();
+ }
+ }
+
+ async onArtifactNameChanged() {
+ this.isLoadingVersions = true;
+ this.versionList = await this.sparqlClient.getVersions(this.accountName, this.groupName, this.artifactName);
+ this.isLoadingVersions = false;
+ this.onChange();
+ }
+
+
+ updateOutputs() {
+
+ const artifactUri = `${DATABUS_RESOURCE_BASE_URL}/${GroupData.getStringOrMissing(this.accountName)}/${GroupData.getStringOrMissing(this.groupName)}/${GroupData.getStringOrMissing(this.artifactName)}`;
+ let versionUri = `${artifactUri}/${GroupData.getStringOrMissing(this.name)}`;
+
+ let graph = {
+ "@id": versionUri,
+ "@type": "Version",
+ "title": this.getValidString(this.title),
+ "abstract": this.getValidString(this.abstract),
+ "description": this.getValidString(this.description),
+ "license": this.getValidString(this.license),
+ "attribution": this.getValidString(this.attribution),
+ "wasDerivedFrom": this.getValidString(this.wasDerivedFrom),
+ }
+
+ graph.distribution = [];
+
+
+ let customVariants = [];
+
+ for (var fg in this.files) {
+
+ var file = this.files[fg];
+
+ var variantSuffix = '';
+ for (var c in this.contentVariants) {
+ var cv = this.contentVariants[c];
+ var value = file.contentVariants[cv.id];
+
+ if (value == undefined || value == "") {
+ continue;
+ }
+
+ variantSuffix += '_' + cv.id + '=' + value;
+ }
+
+ let fileName = this.artifactName;
+
+ var distributionUri = `${versionUri}#${fileName}`;
+ var fileUri = `${versionUri}/${fileName}${variantSuffix}`;
+
+ distributionUri += variantSuffix;
+
+ let formatExtension = this.getValidString(file.contentVariants['formatExtension']);
+
+ if (formatExtension == undefined) {
+ formatExtension = 'none';
+ }
+
+ if (formatExtension != 'none') {
+ distributionUri += '.' + formatExtension;
+ fileUri += '.' + formatExtension;
+ }
+
+ let compression = this.getValidString(file.contentVariants['compression']);
+
+ if (compression == undefined) {
+ compression = 'none';
+ }
+
+ if (compression != 'none') {
+ distributionUri += '.' + compression;
+ fileUri += '.' + compression;
+ }
+
+ var distribution = {
+ "@type": "Part",
+ "formatExtension": formatExtension,
+ "compression": compression,
+ "downloadURL": file.uri,
+ "byteSize": file.byteSize,
+ "sha256sum": file.sha256sum,
+ };
+
+ for (var c in this.contentVariants) {
+ var cv = this.contentVariants[c];
+
+ if (!cv.custom) {
+ continue;
+ }
+
+ var value = file.contentVariants[cv.id];
+
+ if (value == undefined || value == "") {
+ continue;
+ }
+
+ distribution['dcv:' + cv.label] = value;
+
+ if (!customVariants.includes(cv.id)) {
+ customVariants.push(cv.id);
+ }
+ }
+
+ graph.distribution.push(distribution);
+ }
+
+
+
+
+ this.postBody = {
+ "@context": this.getContext(),
+ "@graph": [
+ graph
+ ]
+ };
+
+
+
+ const payload = JSON.stringify(this.postBody, null, 2);
+ const apiKey = this.apiKeys?.find(k => k.keyname === this.apiKeyName)?.apikey;
+
+ this.curlCommand = [
+ `curl -X POST ${DATABUS_RESOURCE_BASE_URL}/api/register \\`,
+ ` -H "X-API-KEY: ${GroupData.getStringOrMissing(apiKey)}" \\`,
+ ` -H "Content-Type: application/json" \\`,
+ ` -d '${payload}'`
+ ].join('\n');
+ }
+
+ createVersionName(v) {
+ if (v == 0) {
+ this.name = new Date().toISOString().slice(0, 10);
+ }
+
+ if (v == 1) {
+ this.name = new Date().toISOString().slice(0, 13);
+ }
+
+ this.onChange();
+ }
+
+ changePage(diff) {
+ this.pageIndex = Math.max(0, this.pageIndex + diff);
+ this.onChange();
+ };
+
+ addContentVariant(variant) {
+
+ if (variant == undefined || variant == '') {
+ return;
+ }
+
+ if (this.contentVariants == undefined) {
+ this.contentVariants = [];
+ }
+
+ for (var c in this.contentVariants) {
+ if (this.contentVariants[c].id == variant) {
+ return;
+ }
+ }
+
+ this.contentVariants.push({
+ label: variant,
+ id: DatabusUtils.uuidv4(),
+ fillRegex: '',
+ toLower: true,
+ pruneWhitespaces: true,
+ custom: true,
+ });
+
+ this.onChange();
+ }
+
+
+ removeContentVariant(variant) {
+ this.contentVariants = this.contentVariants.filter(function (d) {
+ return d.id != variant.id;
+ });
+
+ for (var f in this.files) {
+ var file = this.files[f];
+ delete file.contentVariants[variant.id];
+ }
+
+ this.editContentVariant = null;
+ this.onChange();
+ }
+
+ addFiles(input) {
+ var lines = input.split('\n');
+ for (var line of lines) {
+ if (line != undefined && line.length > 0) {
+ this.addFile(line);
+ }
+ }
+ }
+
+ addFile(file) {
+
+ if (typeof file === 'string') {
+ file = { url: file };
+ }
+
+ if (this.files == undefined) {
+ this.files = [];
+ }
+
+ // Check if already added
+ for (var f in this.files) {
+ if (file.url == this.files[f].url) {
+ return;
+ }
+ }
+
+ var uri = file.url;
+ var uriParts = uri.split('/');
+ var name = uriParts.pop();
+ var nameComponents = name.split('.');
+ name = nameComponents[0];
+
+ if (name.length > 50) {
+ name = name.substr(0, 50) + '...';
+ }
+
+ name = decodeURIComponent(name);
+ // Files with uri as key!!
+
+ this.files.push({
+ id: uri,
+ uri: file.url,
+ name: name,
+ contentVariants: file.contentVariants != null ? file.contentVariants : {},
+ rowspan: 1,
+ });
+
+ this.files.sort(function (a, b) {
+ var nameA = a.name;
+ var nameB = b.name;
+
+ if (nameA < nameB) {
+ return -1;
+ }
+ if (nameA > nameB) {
+ return 1;
+ }
+
+ return 0;
+ });
+
+ let k = 1;
+
+ for (let file of this.files) {
+ file.rowIndex = k++;
+ }
+
+ this.onChange();
+ }
+
+ removeFile = function (file, index) {
+ this.files.splice(index, 1);
+ this.onChange();
+ }
+
+
+ fill(variant) {
+
+ var val = variant.fillRegex;
+
+ for (var file of this.files) {
+
+ if (variant.toLower) {
+ val = val.toLowerCase();
+ }
+
+ if (variant.pruneWhitespaces) {
+ val = val.replaceAll(' ', '');
+ }
+
+ if (!variant.overwrite && file.contentVariants[variant.id] != undefined
+ && file.contentVariants[variant.id].length > 0) {
+ continue;
+ }
+
+ file.contentVariants[variant.id] = val;
+ }
+
+ this.onChange();
+ }
+
+ fillByRegex(variant) {
+ var regex = new RegExp(variant.fillRegex);
+
+ for (var file of this.files) {
+ var matches = file.name.match(regex);
+
+ if (matches != null) {
+ var val = matches[0];
+
+ if (variant.toLower) {
+ val = val.toLowerCase();
+ }
+
+ if (variant.pruneWhitespaces) {
+ val = val.replaceAll(' ', '');
+ }
+
+ if (!variant.overwrite && file.contentVariants[variant.id] != undefined
+ && file.contentVariants[variant.id].length > 0) {
+ continue;
+ }
+
+ file.contentVariants[variant.id] = val;
+ }
+ }
+
+ this.onChange();
+ }
+
+ getRowIndex(files, name) {
+ var k = 1;
+ for (var f in files) {
+ if (files[f].name == name) {
+ return k;
+ }
+
+ k++;
+ }
+
+ return -1;
+ }
+
+
+ cvSplit(files, cvIndex) {
+
+ if (files.length <= 1) {
+ return;
+ }
+
+ if (this.contentVariants == undefined) {
+ this.contentVariants = [];
+ }
+ // if end of cvs, assign errors to all files if files.length > 1
+ if (cvIndex - 2 >= this.contentVariants.length) {
+
+ if (files.length > 1) {
+
+ var cvHints = [];
+
+ if (this.contentVariants.length == 0) {
+ cvHints.push('No content variants have been added yet. Add content variants in the files panel in order to tag your files.');
+ } else {
+ for (var c in this.contentVariants) {
+ var cv = this.contentVariants[c];
+ var value = files[0].contentVariants[cv.id];
+
+ if (value == undefined || value == '') {
+ value = 'none';
+ }
+
+ cvHints.push(cv.id + ': ' + value);
+ }
+ }
+
+ for (let file of files) {
+
+ var errorMessage = 'Row ' + file.rowIndex + ' (' +
+ cvHints.join(', ') + ').';
+
+ file.errors.push({ key: 'err_duplicate_file', message: errorMessage });
+ }
+ }
+
+ return;
+ }
+
+ // else create buckets and sort files into buckets
+ var buckets = {};
+
+ for (var f in files) {
+ var file = files[f];
+
+ var key = null;
+
+ if (cvIndex == 0) {
+ key = file.formatExtension;
+ } else if (cvIndex == 1) {
+ key = file.compression;
+ } else {
+ key = file.contentVariants[this.contentVariants[cvIndex - 2].id];
+ }
+
+ if (key == undefined || key == '') {
+ key = '$_none$';
+ }
+
+ if (buckets[key] == undefined) {
+ buckets[key] = [];
+ }
+
+ buckets[key].push(file);
+ }
+
+ // iterate buckets and call recursively
+ for (var b in buckets) {
+ this.cvSplit(buckets[b], cvIndex + 1);
+ }
+ }
+
+ onEditContentVariant(index) {
+ this.editContentVariant = this.contentVariants[index];
+ }
+
+}
+
+module.exports = VersionHandler;
diff --git a/public/js/search/search-manager.js b/public/js/search/search-manager.js
index 79ba18c1..e5ea9fea 100644
--- a/public/js/search/search-manager.js
+++ b/public/js/search/search-manager.js
@@ -59,12 +59,16 @@ class SearchManager {
return;
}
+ /*
+
var options = {
method: 'GET',
- url: `/${ auth.info.accountName } `,
+ url: `/${ auth.info.accountName }`,
headers: {
'Accept': 'application/ld+json',
- 'X-Jsonld-Formatting': 'flatten'
+ 'X-Jsonld-Formatting': 'flatten',
+ 'Cache-Control': 'no-cache',
+ 'Pragma': 'no-cache'
}
}
@@ -82,7 +86,7 @@ class SearchManager {
this.searchExtensions.push(searchExtension);
- }
+ })*/
}
}
diff --git a/public/js/utils/app-json-formatter.js b/public/js/utils/app-json-formatter.js
index d02193da..6915e234 100644
--- a/public/js/utils/app-json-formatter.js
+++ b/public/js/utils/app-json-formatter.js
@@ -8,48 +8,109 @@ const JsonldUtils = require("./jsonld-utils");
*/
class AppJsonFormatter {
- static createAccountData(resourceBaseUrl, accountName, accountLabel, accountStatus, accountImage) {
+ static async createAccountGraphs(uri, name, label, img, secretaries, status) {
+ var name = UriUtils.uriToName(uri);
+
+ var rsaKeyGraph = {};
+ rsaKeyGraph[DatabusUris.JSONLD_TYPE] = DatabusUris.CERT_RSA_PUBLIC_KEY;
+ rsaKeyGraph[DatabusUris.RDFS_LABEL] = DatabusConstants.WEBID_SHARED_PUBLIC_KEY_LABEL;
+ rsaKeyGraph[DatabusUris.CERT_MODULUS] = signer.getModulus();
+ rsaKeyGraph[DatabusUris.CERT_EXPONENT] = 65537;
+
+ var personUri = `${uri}${DatabusConstants.WEBID_THIS}`;
- var accountUri = `${resourceBaseUrl}/${accountName}`;
- var profileUri = `${resourceBaseUrl}/${accountName}${DatabusConstants.WEBID_DOCUMENT}`;
- var personUri = `${resourceBaseUrl}/${accountName}${DatabusConstants.WEBID_THIS}`;
+ var personGraph = {};
+ personGraph[DatabusUris.JSONLD_ID] = personUri;
+ personGraph[DatabusUris.JSONLD_TYPE] = [ DatabusUris.FOAF_PERSON, DatabusUris.DBP_DBPEDIAN ];
+ personGraph[DatabusUris.FOAF_ACCOUNT] = JsonldUtils.refTo(uri);
+ personGraph[DatabusUris.DATABUS_ACCOUNT_PROPERTY] = uri;
+ personGraph[DatabusUris.CERT_KEY] = [ rsaKeyGraph ];
+ personGraph[DatabusUris.FOAF_NAME] = label;
+
+ if(img != null) {
+ personGraph[DatabusUris.FOAF_IMG] = img;
+ }
+
+ if(status != null) {
+ personGraph[DatabusUris.FOAF_STATUS] = status;
+ }
+
+ var profileUri = `${uri}${DatabusConstants.WEBID_DOCUMENT}`;
+
+ var profileDocumentGraph = {};
+ profileDocumentGraph[DatabusUris.JSONLD_ID] = profileUri;
+ profileDocumentGraph[DatabusUris.JSONLD_TYPE] = DatabusUris.FOAF_PERSONAL_PROFILE_DOCUMENT;
+ profileDocumentGraph[DatabusUris.FOAF_MAKER] = JsonldUtils.refTo(personUri);
+ profileDocumentGraph[DatabusUris.FOAF_PRIMARY_TOPIC] = JsonldUtils.refTo(personUri);
+
+ var accountGraph = {}
+ accountGraph[DatabusUris.JSONLD_ID] = uri;
+ accountGraph[DatabusUris.JSONLD_TYPE] = DatabusUris.DATABUS_ACCOUNT;
+ accountGraph[DatabusUris.FOAF_ACCOUNT_NAME] = name;
+ accountGraph[DatabusUris.DATABUS_NAME] = name;
+
+ if(secretaries != null) {
+
+ accountGraph[DatabusUris.DATABUS_SECRETARY_PROPERTY] = [];
+
+ for(var secretary of secretaries) {
+
+ let secretaryAccountUri = `${secretary.accountName}`;
+
+ let secretaryGraph = {};
+ secretaryGraph[DatabusUris.JSONLD_TYPE] = DatabusUris.DATABUS_SECRETARY;
+ secretaryGraph[DatabusUris.DATABUS_ACCOUNT_PROPERTY] = JsonldUtils.refTo(secretaryAccountUri);
+
+ if(secretary.hasWriteAccessTo != undefined) {
+ secretaryGraph[DatabusUris.DATABUS_HAS_WRITE_ACCESS_TO] = [];
+
+ for(var writeAccess of secretary.hasWriteAccessTo) {
+ secretaryGraph[DatabusUris.DATABUS_HAS_WRITE_ACCESS_TO].push(JsonldUtils.refTo(writeAccess));
+ }
+ }
+
+ accountGraph[DatabusUris.DATABUS_SECRETARY_PROPERTY].push(secretaryGraph);
+ }
+ }
+
+ let expandedGraphs = [
+ accountGraph,
+ personGraph,
+ profileDocumentGraph
+ ];
+
+ return await jsonld.compact(expandedGraphs, JsonldLoader.DEFAULT_CONTEXT_URL);
+ }
+
+ static createAccountData(accountUri, accountLabel, accountStatus, accountImage) {
+
+ var personUri = `${accountUri}${DatabusConstants.WEBID_THIS}`;
var accountJsonLd = {};
+ var accountGraph = {};
+ accountGraph[DatabusUris.JSONLD_ID] = accountUri;
+ accountGraph[DatabusUris.JSONLD_TYPE] = DatabusUris.DATABUS_ACCOUNT;
+
var personGraph = {};
personGraph[DatabusUris.JSONLD_ID] = personUri;
- personGraph[DatabusUris.JSONLD_TYPE] = [
- DatabusUris.FOAF_PERSON,
- DatabusUris.DBP_DBPEDIAN
- ];
+ personGraph[DatabusUris.JSONLD_TYPE] = DatabusUris.FOAF_PERSON;
personGraph[DatabusUris.FOAF_NAME] = accountLabel;
+ personGraph[DatabusUris.FOAF_ACCOUNT] = JsonldUtils.refTo(accountUri);
if (accountStatus != null) {
personGraph[DatabusUris.FOAF_STATUS] = accountStatus;
}
- personGraph[DatabusUris.FOAF_ACCOUNT] = {};
- personGraph[DatabusUris.FOAF_ACCOUNT][DatabusUris.JSONLD_ID] = accountUri;
-
if (accountImage != null) {
- personGraph[DatabusUris.FOAF_IMG] = {};
- personGraph[DatabusUris.FOAF_IMG][DatabusUris.JSONLD_ID] = accountImage;
+ personGraph[DatabusUris.FOAF_IMG] = JsonldUtils.refTo(accountImage);
}
- var profileGraph = {};
- profileGraph[DatabusUris.JSONLD_ID] = profileUri;
- profileGraph[DatabusUris.JSONLD_TYPE] = DatabusUris.FOAF_PERSONAL_PROFILE_DOCUMENT;
- profileGraph[DatabusUris.FOAF_PRIMARY_TOPIC] = {};
- profileGraph[DatabusUris.FOAF_PRIMARY_TOPIC][DatabusUris.JSONLD_ID] = personUri;
- profileGraph[DatabusUris.FOAF_MAKER] = {};
- profileGraph[DatabusUris.FOAF_MAKER][DatabusUris.JSONLD_ID] = personUri;
- accountJsonLd[DatabusUris.JSONLD_GRAPH] = [
- personGraph,
- profileGraph
+ return [
+ accountGraph,
+ personGraph
];
-
- return accountJsonLd;
}
static formatGroupData(graphs) {
@@ -84,12 +145,14 @@ class AppJsonFormatter {
static formatAccountData(graphs) {
var result = {};
- var profileGraph = JsonldUtils.getTypedGraph(graphs, DatabusUris.FOAF_PERSONAL_PROFILE_DOCUMENT);
+ var accountGraph = JsonldUtils.getTypedGraph(graphs, DatabusUris.DATABUS_ACCOUNT);
var personGraph = JsonldUtils.getTypedGraph(graphs, DatabusUris.FOAF_PERSON);
- result.uri = profileGraph[DatabusUris.JSONLD_ID];
+ result.uri = accountGraph[DatabusUris.JSONLD_ID];
result.accountName = DatabusUtils.uriToResourceName(result.uri);
- result.label = JsonldUtils.getProperty(personGraph, DatabusUris.FOAF_NAME);
+ result.label = JsonldUtils.getFirstProperty(personGraph, DatabusUris.FOAF_NAME);
+ result.imageUrl = JsonldUtils.getFirstProperty(personGraph, DatabusUris.FOAF_IMG);
+ result.about = JsonldUtils.getFirstProperty(personGraph, DatabusUris.FOAF_STATUS);
result.webIds = [];
result.searchExtensions = [];
@@ -113,6 +176,30 @@ class AppJsonFormatter {
}
}
+ result.secretaries = [];
+ var secretaryGraphs = JsonldUtils.getTypedGraphs(graphs, DatabusUris.DATABUS_SECRETARY);
+
+ for (var secretaryGraph of secretaryGraphs) {
+ var secretaryData = {
+ accountName: JsonldUtils.getProperty(secretaryGraph, DatabusUris.DATABUS_ACCOUNT_PROPERTY),
+ hasWriteAccessTo: []
+ };
+
+ var writeAccessUris = secretaryGraph[DatabusUris.DATABUS_HAS_WRITE_ACCESS_TO];
+
+ if (Array.isArray(writeAccessUris)) {
+ for (var item of writeAccessUris) {
+ if (typeof item === 'object' && item['@id']) {
+ secretaryData.hasWriteAccessTo.push(item['@id']);
+ } else if (typeof item === 'string') {
+ secretaryData.hasWriteAccessTo.push(item);
+ }
+ }
+ }
+
+ result.secretaries.push(secretaryData);
+ }
+
return result;
}
@@ -145,6 +232,7 @@ class AppJsonFormatter {
result.description = JsonldUtils.getProperty(collectionGraph, DatabusUris.DCT_DESCRIPTION);
result.issued = JsonldUtils.getProperty(collectionGraph, DatabusUris.DCT_ISSUED);
result.publisher = JsonldUtils.getProperty(collectionGraph, DatabusUris.DCT_PUBLISHER);
+ result.account = JsonldUtils.getProperty(collectionGraph, DatabusUris.DATABUS_ACCOUNT_PROPERTY);
var content = JsonldUtils.getProperty(collectionGraph, DatabusUris.DATABUS_COLLECTION_CONTENT)
result.content = DatabusUtils.tryParseJson(unescape(content));
diff --git a/public/js/utils/databus-messages.js b/public/js/utils/databus-messages.js
index 8155d0f1..cc046240 100644
--- a/public/js/utils/databus-messages.js
+++ b/public/js/utils/databus-messages.js
@@ -22,6 +22,8 @@ class DatabusMessages {
static ACCOUNT_API_KEY_CREATED = 'API key created';
static ACCOUNT_WEBID_LINKED = 'External WebId has been linked to your profile';
+
+
}
module.exports = DatabusMessages;
diff --git a/public/js/utils/databus-uris.js b/public/js/utils/databus-uris.js
index 34b00743..8f80cdd2 100644
--- a/public/js/utils/databus-uris.js
+++ b/public/js/utils/databus-uris.js
@@ -14,10 +14,19 @@ class DatabusUris {
static DATABUS_PART = 'https://dataid.dbpedia.org/databus#Part';
static DATABUS_VERSION = 'https://dataid.dbpedia.org/databus#Version';
static DATABUS_GROUP = 'https://dataid.dbpedia.org/databus#Group';
+ static DATABUS_ACCOUNT = 'https://dataid.dbpedia.org/databus#Account';
static DATABUS_ARTIFACT = 'https://dataid.dbpedia.org/databus#Artifact';
static DATABUS_VERSION_PROPERTY = 'https://dataid.dbpedia.org/databus#version';
static DATABUS_GROUP_PROPERTY = 'https://dataid.dbpedia.org/databus#group';
static DATABUS_ACCOUNT_PROPERTY = 'https://dataid.dbpedia.org/databus#account';
+ static DATABUS_HAS_ARTIFACT = 'https://dataid.dbpedia.org/databus#hasArtifact';
+ static DATABUS_HAS_VERSION = 'https://dataid.dbpedia.org/databus#hasVersion';
+ static DATABUS_NAME = 'https://dataid.dbpedia.org/databus#name';
+
+ static DATABUS_SECRETARY_PROPERTY = 'https://dataid.dbpedia.org/databus#secretary';
+ static DATABUS_SECRETARY = 'https://dataid.dbpedia.org/databus#Secretary';
+ static DATABUS_HAS_WRITE_ACCESS_TO = 'https://dataid.dbpedia.org/databus#hasWriteAccessTo';
+
static DATABUS_ARTIFACT_PROPERTY = 'https://dataid.dbpedia.org/databus#artifact';
static DATABUS_FORMAT = 'https://dataid.dbpedia.org/databus#format';
static DATABUS_FORMAT_EXTENSION = 'https://dataid.dbpedia.org/databus#formatExtension';
@@ -87,6 +96,7 @@ class DatabusUris {
static FOAF_PERSON = 'http://xmlns.com/foaf/0.1/Person';
static FOAF_PRIMARY_TOPIC = 'http://xmlns.com/foaf/0.1/primaryTopic';
static FOAF_MAKER = 'http://xmlns.com/foaf/0.1/maker';
+ static FOAF_ACCOUNT_NAME = 'http://xmlns.com/foaf/0.1/accountName';
static FOAF_IMG = 'http://xmlns.com/foaf/0.1/img';
// S4AC
diff --git a/public/js/utils/databus-utils.js b/public/js/utils/databus-utils.js
index ac82096f..a35d0886 100644
--- a/public/js/utils/databus-utils.js
+++ b/public/js/utils/databus-utils.js
@@ -2,6 +2,7 @@ const DatabusCollectionUtils = require("../collections/databus-collection-utils"
var markdownit = require('markdown-it');
const moment = require("moment/moment");
const DatabusUris = require("./databus-uris");
+const ApiError = require("../../../server/app/common/utils/api-error");
class DatabusUtils {
@@ -13,6 +14,23 @@ class DatabusUtils {
return fallback;
}
+ static resemblesTrue(value) {
+ if (typeof value === 'boolean') {
+ return value;
+ }
+
+ if (typeof value === 'string') {
+ const normalized = value.trim().toLowerCase();
+ return ['true', '1', 'yes', 'on'].includes(normalized);
+ }
+
+ if (typeof value === 'number') {
+ return value === 1;
+ }
+
+ return false;
+ }
+
static isValidResourceIdentifier(identifier, min) {
var identifierRegex = /^[a-z-]+$/;
return this.checkField(identifier, identifierRegex, min, 50);
@@ -21,16 +39,16 @@ class DatabusUtils {
static formatQuery(query, placeholderMappings) {
if (placeholderMappings == undefined) {
- return query;
+ return query;
}
-
+
for (var placeholder in placeholderMappings) {
- var re = new RegExp('%' + placeholder + '%', "g");
- query = query.replace(re, placeholderMappings[placeholder]);
+ var re = new RegExp('%' + placeholder + '%', "g");
+ query = query.replace(re, placeholderMappings[placeholder]);
}
-
+
return query;
- }
+ }
static isValidVersionIdentifier(identifier) {
var labelRegex = /^[A-Za-z0-9_\.\-]*$/;
@@ -163,7 +181,7 @@ class DatabusUtils {
var result = uri.substr(uri.lastIndexOf('/') + 1);
- if(result.includes('#')) {
+ if (result.includes('#')) {
result = result.substr(0, result.indexOf('#'));
}
@@ -358,9 +376,18 @@ class DatabusUtils {
return undefined;
}
+ static getFirstSegment(uri) {
+ try {
+ const url = new URL(uri);
+ return url.pathname.split('/').filter(Boolean)[0] || null;
+ } catch {
+ return null;
+ }
+ }
+
static parseMarkdown(markdown) {
- if(markdown == null) {
+ if (markdown == null) {
return null;
}
@@ -370,7 +397,7 @@ class DatabusUtils {
static renderMarkdown(markdown) {
- if(markdown == null) {
+ if (markdown == null) {
return null;
}
@@ -384,19 +411,19 @@ class DatabusUtils {
*/
static createAbstractFromDescription(description) {
- if(description == null) {
+ if (description == null) {
return null;
}
try {
var tokens = this.parseMarkdown(description);
-
+
var paragraphFound = false;
var result = "";
- if(tokens == null) {
- return result;
+ if (tokens == null) {
+ return result;
}
var firstParagraphText = null;
@@ -504,6 +531,4 @@ class DatabusUtils {
}
-// export default DatabusUtils;
-
module.exports = DatabusUtils;
diff --git a/public/js/utils/databus-webapp-utils.js b/public/js/utils/databus-webapp-utils.js
index dbf6b86f..06311d0d 100644
--- a/public/js/utils/databus-webapp-utils.js
+++ b/public/js/utils/databus-webapp-utils.js
@@ -9,10 +9,46 @@ class DatabusWebappUtils {
this.sce = $sce;
}
+ goTo(page) {
+ window.location = page;
+ }
+
createAccount() {
window.location = '/app/account';
}
+
+ getAccountName() {
+
+ let accountName = window.location.pathname.split('/')[1];
+
+ if(accountName.length < 4) {
+ return null;
+ }
+
+ return this.getOwnedAccountName(accountName);
+ }
+
+ getOwnedAccountName(accountName) {
+ if(!this.scope.auth.authenticated || this.scope.auth.info == null) {
+ return null;
+ }
+
+ let userInfo = this.scope.auth.info;
+
+ if(!Array.isArray(userInfo.accounts) || userInfo.accounts.length == 0) {
+ return null;
+ }
+
+ let account = userInfo.accounts.find(a => a.accountName == accountName);
+
+ if(account == null) {
+ return null;
+ }
+
+ return account.accountName;
+ }
+
login() {
window.location = '/app/login?redirectUrl=' + encodeURIComponent(window.location);
}
diff --git a/public/js/utils/jsonld-utils.js b/public/js/utils/jsonld-utils.js
index 4926da81..965b47e1 100644
--- a/public/js/utils/jsonld-utils.js
+++ b/public/js/utils/jsonld-utils.js
@@ -3,6 +3,12 @@ const DatabusUris = require("./databus-uris");
class JsonldUtils {
+ static refTo(uri) {
+ var result = {};
+ result[DatabusUris.JSONLD_ID] = uri;
+ return result;
+ }
+
static getTypedGraph(graphs, graphType) {
for (var g in graphs) {
@@ -35,6 +41,16 @@ class JsonldUtils {
graph[property].push(entry);
}
+ static getGraphById = function (graphs, id) {
+ return graphs.find(g => g[DatabusUris.JSONLD_ID] === id);
+ };
+
+ static getRefArrayProperty = function (graph, propertyUri) {
+ const val = graph[propertyUri];
+ if (!val) return [];
+ return val.map(v => v[DatabusUris.JSONLD_ID]);
+ };
+
static getProperty(graph, property) {
if (graph[property] == undefined) {
return null;
@@ -74,6 +90,45 @@ class JsonldUtils {
return null;
}
+ static getFirstProperty(graph, property) {
+ if (graph[property] == undefined) {
+ return null;
+ }
+
+ const values = graph[property];
+
+ if (values.length === 0) {
+ return null;
+ }
+
+ if (values.length === 1) {
+ const value = values[0];
+
+ if (value[DatabusUris.JSONLD_VALUE] != null) {
+ return value[DatabusUris.JSONLD_VALUE];
+ }
+
+ if (value[DatabusUris.JSONLD_ID] != null) {
+ return value[DatabusUris.JSONLD_ID];
+ }
+
+ return null;
+ }
+
+ for (const value of values) {
+ if (value[DatabusUris.JSONLD_VALUE] != null) {
+ return value[DatabusUris.JSONLD_VALUE];
+ }
+
+ if (value[DatabusUris.JSONLD_ID] != null) {
+ return value[DatabusUris.JSONLD_ID];
+ }
+ }
+
+ return null;
+ }
+
+
static getGraphById(graphs, id) {
for (var g in graphs) {
var graph = graphs[g];
@@ -84,8 +139,6 @@ class JsonldUtils {
}
return null;
-
-
}
static getTypedGraphs(graphs, graphType) {
@@ -133,14 +186,27 @@ class JsonldUtils {
return obj[0];
}
- static getFirstObjectUri(graph, key) {
- var obj = graph[key];
+ static getFirstObjectUri(graph, property) {
+ // Get the object
+ const obj = graph[property];
- if (obj == undefined || obj.length < 1) {
+ // Not found -> null
+ if (!obj) {
return null;
}
- return obj[0][DatabusUris.JSONLD_ID];
+ // If it is an array...
+ if (Array.isArray(obj)) {
+ for (const item of obj) {
+ if (item && typeof item === 'object' && DatabusUris.JSONLD_ID in item) {
+ return item[DatabusUris.JSONLD_ID];
+ }
+ }
+ } else if (typeof obj === 'object' && DatabusUris.JSONLD_ID in obj) {
+ return obj[DatabusUris.JSONLD_ID];
+ }
+
+ return null;
}
}
diff --git a/public/js/utils/messages.js b/public/js/utils/messages.js
new file mode 100644
index 00000000..cbf8ff4a
--- /dev/null
+++ b/public/js/utils/messages.js
@@ -0,0 +1,23 @@
+export class DatabusMsg {
+ static messages = {
+ err_invalid_group_name: "Please enter between 3 to 50 characters. \nRegex: [a-zA-Z0-9_\\-\\.]{3,50}$",
+ err_no_group_selected: "Please select a group",
+ err_no_artifact_selected: "Please select an artifact",
+
+ err_invalid_artifact_name: "Please enter between 3 to 50 characters. \nRegex: [a-zA-Z0-9_\\-\\.]{3,50}$",
+ err_invalid_version_name: "Please enter between 3 to 50 characters. \nRegex: [a-zA-Z0-9_\\-\\.]{3,50}$",
+ err_invalid_version_title: "The version title is missing.",
+ err_invalid_version_abstract: "The version abstract is missing.",
+ err_invalid_version_description: "The version description is missing.",
+ err_invalid_version_license: "The license is invalid. Please enter a license URI.",
+ err_no_files: "You have to upload at least one file.",
+ err_not_analyzed: "This file has not been analzyed yet.",
+ warning_group_exists: "A group with this name already exists. Publishing will overwrite its metadata.",
+ warning_artifact_exists: "An artifact with this name already exists. Publishing will overwrite its metadata.",
+ warning_version_exists: "A version with this name already exists. Publishing will overwrite its metadata. This is not recommended, as other users might use your version identifier as a data dependency."
+ };
+
+ static get(key) {
+ return this.messages[key] || "Unknown validation key.";
+ }
+}
diff --git a/public/js/utils/tab-navigation.js b/public/js/utils/tab-navigation.js
index 8ef980b5..26ce0703 100644
--- a/public/js/utils/tab-navigation.js
+++ b/public/js/utils/tab-navigation.js
@@ -1,10 +1,11 @@
class TabNavigation {
- constructor($scope, $location, tabKeys) {
+ constructor($scope, $location, tabKeys, onNavigateCallback) {
this.location = $location;
this.tabKeys = tabKeys;
this.activeTab = 0;
+ this.onNavigateCallback = onNavigateCallback;
var self = this;
// Watch the location hash and tell the tabnavigation that it changed
@@ -21,9 +22,18 @@ class TabNavigation {
var tabKey = this.tabKeys[i];
if (value == tabKey) {
this.activeTab = i;
+
+ if(this.onNavigateCallback != null) {
+ this.onNavigateCallback(this.activeTab);
+ }
return;
}
}
+
+ this.activeTab = 0;
+ if(this.onNavigateCallback != null) {
+ this.onNavigateCallback(this.activeTab);
+ }
}
/**
diff --git a/public/templates/404.ejs b/public/templates/404.ejs
index 1a959725..807ba4b5 100644
--- a/public/templates/404.ejs
+++ b/public/templates/404.ejs
@@ -1,6 +1,6 @@
<%- include('header') -%>
{{ utils.formatDate(version.date) }}
- {{ version.license }}
+ {{ version.license
+ }}
diff --git a/public/templates/banner.ejs b/public/templates/banner.ejs
new file mode 100644
index 00000000..88244ce8
--- /dev/null
+++ b/public/templates/banner.ejs
@@ -0,0 +1,36 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/public/templates/collection-editor.ejs b/public/templates/collection-editor.ejs
index 088880df..bad06fc9 100644
--- a/public/templates/collection-editor.ejs
+++ b/public/templates/collection-editor.ejs
@@ -32,16 +32,9 @@
+
+
+
+
+
+
+ File
+
+
+
+
+
+
+ {{ $index + 1 }}
+
+
+
+
+
+
+
-
Files
- [GROUP]
+ File
-
+
-
+
@@ -68,37 +67,6 @@
-
@@ -57,8 +57,7 @@
ng-click="tabNavigation.navigateTo('collections');">
-
- Collections
-
-
-
-
- Unlock your account by entering a username (your publishing namespace)
- and clicking the
- button below.
Choose your username carefully as you will not be able to change it later.
-
-
-
-
-
-
-
-
-
- {{ createAccountError }}
-
-
- -
-
- Between 4 and 15 characters -
- Starts and ends with a lowercase letter -
- Only lowercase letters, numbers, underscores and dashes allowed -
+
@@ -223,16 +191,16 @@
![]()
-
-
+
-
About
- {{ profileData.about }}
+{{ account.about }}
-
-
+
+
@@ -244,8 +212,7 @@
+
@@ -307,14 +274,14 @@
-
-
+
+ ng-repeat="collection in collectionList | collectionfilter:collectionSearch.input | orderBy:collectionSearch.sortProperty:collectionSearch.sortReverse">
-
+
-
+
diff --git a/public/templates/artifact.ejs b/public/templates/artifact.ejs
index 0dae693c..cdc12920 100644
--- a/public/templates/artifact.ejs
+++ b/public/templates/artifact.ejs
@@ -75,7 +75,6 @@
ng-click="tabNavigation.navigateTo('versions');">
-
Versions
@@ -170,7 +169,8 @@
{{ version.version }}
-
diff --git a/public/templates/download.ejs b/public/templates/download.ejs
deleted file mode 100644
index 4481ac66..00000000
--- a/public/templates/download.ejs
+++ /dev/null
@@ -1,31 +0,0 @@
-
-<%- include('header') -%>
-
-
-
-
diff --git a/public/templates/collections-editor.ejs b/public/templates/collections-editor.ejs
index 29057d26..0da938b8 100644
--- a/public/templates/collections-editor.ejs
+++ b/public/templates/collections-editor.ejs
@@ -32,15 +32,8 @@
You need to create a user account in order to publish data.
--
-
-
+
+
Error: Collection Not Found
+A local working copy with the specified UUID could not be found.
-
-
You need to create a user account in order to publish data.
+A local working copy with the specified UUID could not be found.
-
-
-
-
-
-
-
-
-
-
-
-<%- include('footer') -%>
diff --git a/public/templates/group.ejs b/public/templates/group.ejs
index 5bf39412..7d321452 100644
--- a/public/templates/group.ejs
+++ b/public/templates/group.ejs
@@ -66,7 +66,6 @@
ng-click="tabNavigation.navigateTo('artifacts');">
-
-
-
-
-
-
- Publish
-
-
- Artifacts
diff --git a/public/templates/header.ejs b/public/templates/header.ejs
index 02633afd..f0a8d986 100644
--- a/public/templates/header.ejs
+++ b/public/templates/header.ejs
@@ -14,10 +14,10 @@
-
+
-
+
@@ -28,262 +28,7 @@
-
-
+
+<%- include('variables') -%>
+<%- include('nav') -%>
\ No newline at end of file
diff --git a/public/templates/index.ejs b/public/templates/index.ejs
index d244580b..a87f24a4 100644
--- a/public/templates/index.ejs
+++ b/public/templates/index.ejs
@@ -4,70 +4,79 @@
-
-
-
-
+ <%- include('banner') -%>
-
-
Recent Activity
-
-
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
-
-
+
Most Active Users
- -
-
-
+
+
-
-
-
-
-
+
+
+
-
+
Login or Register
+Publish data, create data collections and manage your account
-
+
+
+
-
-
+
+
Register Data
+Generate RDF metadata for your files with the metadata wizard
+
-
+
+
@@ -94,14 +162,13 @@
\ No newline at end of file
diff --git a/public/templates/publish-wizard copy.ejs b/public/templates/publish-wizard copy.ejs
new file mode 100644
index 00000000..17f696e9
--- /dev/null
+++ b/public/templates/publish-wizard copy.ejs
@@ -0,0 +1,320 @@
+<%- include('header') -%>
+
+
+
+
+
-
<%- include('footer') -%>
\ No newline at end of file
diff --git a/public/templates/nav.ejs b/public/templates/nav.ejs
new file mode 100644
index 00000000..6b955bca
--- /dev/null
+++ b/public/templates/nav.ejs
@@ -0,0 +1,223 @@
+
\ No newline at end of file
diff --git a/public/templates/profile.ejs b/public/templates/profile.ejs
index b49107f6..dd9f5f01 100644
--- a/public/templates/profile.ejs
+++ b/public/templates/profile.ejs
@@ -3,7 +3,7 @@
Search
+ +
+
+
+
+
+
-
+
API
+Automate your data pipelines with the
+ Databus API
+
-
+
+
+
+
+
-
+
-
+
Recent Activity
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+ Most + Active Users
+ +
+
-
@@ -76,21 +85,24 @@
-
NEW Datasets
+
+
+
+
+
NEW + Datasets
-
+
-
EDIT PROFILE
+EDIT PUBLIC PROFILE
@@ -46,10 +46,76 @@
separated by newlines.
+
+
+
+
Secretaries
+
+ Secretaries are accounts that receive write access to some or all resources of the namespace
+ of this account. The secretary account can then specify this account in the x-on-behalf-of header
+ when making requests on behalf of this account.
+
+
+
+
+ No secretaries defined.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Delete
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -59,6 +125,8 @@
API KEYS
Enter a name for your API key and click Create to create a new API
key.
-
-
Active API Keys
- You haven't created any API
+
+
+
+ You haven't
+ created any API
keys yet.
-
+
+ DANGER ZONE
+
+
+
+
+
+
+ Delete Account
+
+
+
+
+ + + Delete + +
+
+
+
+
+
+
+
+<%- include('footer') -%>
diff --git a/public/templates/publish-wizard-old.ejs b/public/templates/publish-wizard-old.ejs
new file mode 100644
index 00000000..ef636791
--- /dev/null
+++ b/public/templates/publish-wizard-old.ejs
@@ -0,0 +1,1064 @@
+<%- include('header') -%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Metadata Wizard
+The metadata wizard helps generate and publish Databus metadata step-by-step. Choose options below to create valid JSON-LD metadata.
+NERD MODE ENABLED — Directly send raw JSON-LD to the API. You know what you're doing.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Step 1: Choose Account
+
+
+ Account Name
+
+
+
+
+
+
+
+
+
+
+
+
+ Step 2: Choose or Create Group
+
+
+
+ Metadata
+
+
+
+
+
+
+
+ Name
+
+
+
+
+
+
+
+
+
+
+ Name
+
+
+
+
+
+
+
+ Title
+
+
+
+
+
+ Step 3: Choose or Create Artifact
+
+
+
+ Metadata
+
+
+
+
+
+
+
+ Name
+
+
+
+
+
+
+
+
+
+
+ Name
+
+
+
+ Title
+
+
+
+
+
+
+ Step 4: Choose or Create Version
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%- include('footer') -%>
\ No newline at end of file
diff --git a/public/templates/publish-wizard.ejs b/public/templates/publish-wizard.ejs
index b54a9aba..a3dffb24 100644
--- a/public/templates/publish-wizard.ejs
+++ b/public/templates/publish-wizard.ejs
@@ -4,964 +4,697 @@
+
+
+
+
+
+ Metadata Wizard
+The metadata wizard can help you generate Databus metadata for your files. Fill out the form below to + generate JSON-LD metadata that can be published via the Databus API.
+NERD MODE ENABLED Send JSON-LD inputs against the Databus API directly. You know what to do.
++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Login or Register
+Login or register to use the metadata wizard
+
+
+
+
+
+
+ Create Account
+Create an account to use the metadata wizard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PUBLISH
+
+
+
+
+
+
+
+
+ JSON Body
+
+
+
+
+
+
+
+ Log Level
+
+
+
+
+
+
+
+
+
+
+
+ + +
+Result
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ entry.msg }}
+ {{ entry.msg }}
+
+
+ {{ entry.payload | json }}
+
+
+
+
+ ACCOUNT INFO
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Name
+
+
+
+
+
+
+
+
+ GROUP INFO
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Group Metadata
+
+
+
+
+
+
+
+
+ Name
+
+
+
+
+
+
+
+
+
+
+ Name
+
+
+ {{
+ texts.errors['err_invalid_group_title'] }}
+ {{
+ texts.errors['warning_group_exists'] }}
+
+
+
+ Title
+
+
+
+
+
+ Abstract
+
+
+
+
+
+
+
+
+
+
+
+ Description
+
+
+
+
+
+
+
+
+
+
+
+ ARTIFACT INFO
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
- + {{ texts.errors[error] }} + +
+
+
+
+
+
+ -
+
- {{ hint }} +
+
+
+
+
+
+
+ Artifact Metadata
+
+
+
+
+
+
+
+ Name
+
+
+
+
+
+
+
+
+
+
+ Name
+
+
+ {{
+ texts.errors['err_invalid_artifact_title'] }}
+ {{
+ texts.errors['warning_artifact_exists'] }}
+
+
+
+
+ Title
+
+
+ {{
+ texts.errors['err_invalid_artifact_label'] }}
+
+
+
+
+
+ Abstract
+
+
+
+
+
+
+
+
+
+
+
+ Description
+
+
+ {{
+ texts.errors['err_invalid_group_description'] }}
+
+ VERSION INFO
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Version Metadata
+
+
+
+
+
+
+
+
+
+ Name
+
+
+
+
+
+ {{
+ texts.errors['warning_version_exists'] }}
+ {{
+ texts.errors['err_invalid_version_name'] }}
+
+
+
+
+
+
+
+
+
+
+ Name
+
+
+ {{
+ texts.errors['warning_version_exists'] }}
+
+
+
+
+
+
+
+
+
+ Title
+
+
+
+
+
+
+
+
+
+ {{
+ texts.errors['err_invalid_version_title'] }}
+
+
+
+ Abstract
+
+
+
+
+
+
+
+
+
+ {{
+ texts.errors['err_invalid_version_abstract'] }}
+
+
+
+
+ Description
+
+
+ {{
+ texts.errors['err_invalid_version_description'] }}
+
+
+
+
+
+
+ License URI
+
+
+
+
+
+
+
+ {{
+ texts.errors['err_invalid_version_license'] }}
+
+
+
+
+
+
+
+
+
+
+ Attribution
+
+
+
+
+
+ Derived From
+
+
+
+
+
+ FILES INFO
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Add Files
+
+
+ Enter file URLs divided by newlines and click Add URLs to add file entries to your
+ metadata document. The file URLs can be used by other users to download your files.
+
+
+
+
+
+ Add URLs
+
+
+
+
+ Add Files From Resource Page
+
+
+ Searches the HTML document of the entered URL for any links to files and adds the file URLs
+ to
+ the version.
+
+
+
+
+
+
+
+
+ Fetch URLs
+
+
+
+
+
+
+
+
+
+ Content Variants
+
+
+
+
+
+
+
+ -
+
- {{ hint }} +
+
+
+ Content variants are facets that you can add to your files. This can be helpful when your
+ files
+ exist in multiple languages or your dataset is partitioned into multiple files in any other way.
+ Content variants can help other Databus users to find the correct files for their use case. Read
+ more about content variants here.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ variant.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ File Table
+
+ {{
+ texts.errors['err_no_files'] }}
+
+
+
+
+
+
+ Add files by entering a file URL or resource page URL in the input fields above
+ and clicking the respective button.
+
+
+
+
+
+
+
+
+
+
+ SIGNATURE
+
+
+
+
+
+
+ Publisher
+
+
+ Every dataset on the Databus needs to be signed by the publisher. Databus uses cryptographic
+ keypairs and public keys exposed via WebId to enable decentralized dataset validation. You can
+ either use your Databus account as a WebId and let the Databus sign your metadata or sign it
+ with
+ your own private key and WebId. For more information, please refer to the Gitbook.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Signature
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ session.formData.signature.tractate}}
+
+
+
+
+
+
+
+ Click the Create Tractate button to generate the tractate for your metadata
+ document. The Databus tractate is a minimal canonicalized form of your document containing
+ the most crucial pieces of information. Sign the tractate with your private key and post
+ the
+ signature into the field below.
+ Publish
+
+
+
+
+
+ Group Metadata
+ {{ session.inputs.group["@graph"] | json }}
+ + Fix all errors to preview the metadata ++
+
+ Artifact Metadata
+ {{ session.inputs.artifact["@graph"] | json }}
+ + Fix all errors to preview the artifact metadata ++
+
+ Version Metadata
+ {{ session.inputs.dataid["@graph"] | json }}
+ + Fix all errors to preview the version metatdata ++
+
+
+
+ Full Publish Request Body
+ +Hide{{ session.inputs.all | json }}
+Show...
+ Fix all errors to preview the full request body ++
+
+ Publish Consent
+
+
+
+
+
+
+ + +
+Result
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ entry.msg }}
+ {{ entry.msg }}
+
+
+ {{ entry.payload | json }}
+
+
+ + +
+
+
+ .form-column:not(:first-child) {
+ border-left: 1px solid rgb(225 228 232);
+ }
-
-
-
-
-
+ .wiz-container {
+ max-width: 1600px;
+ margin: auto;
+ }
-
+ .menu-card:hover {
+ background-color: #f9f9f9;
+ }
+ .dropdown {
+ margin-bottom: 1rem;
+ }
+ .topbar {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-top: 1rem;
+ margin-bottom: 0.5rem
+ }
-
-
-
-
-
+ .menu-card {
+ border: 1px solid rgb(225 228 232);
+ background-color: white;
+ border-radius: 12px;
+ padding: 2rem;
+ width: 240px;
+ text-align: center;
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+ cursor: pointer;
+ transition: all 0.2s ease;
+ }
-
-
-
-
-
-
- You need to be logged in to publish data.
--
Don't have an account yet? Create one now!
--
-
-
-
-
+ .form-layout {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 2rem;
+ min-height: 500px;
+ padding: 1rem 0;
+ }
-
-
-
-
- You need to create a user account in order to publish data.
--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Publish Wizard
-Nerd mode. You know what to do. You can send JSON bodies to the publish API directly and choose a log level.
-PUBLISH
-
-
-
+ .form-panel .field {
+ margin-bottom: 1.5em;
+ }
+ .jsonld-panel pre {
+ background: #f9f9f9;
+ border-radius: 8px;
+ padding: 1rem;
+ white-space: pre-wrap;
+ overflow-x: auto;
+ max-height: 300px;
+ }
-
-
-
-
- JSON Body
-
-
-
-
-
+ .form-panel,
+ .jsonld-panel {
+ border: 1px solid #dbdbdb;
+ background-color: white;
+ min-height: 460px;
+ }
+ .form-panel .field .label {
+ text-transform: uppercase;
+ margin-left: 4px;
+ color: #888;
+ font-size: 0.9em;
+ letter-spacing: 0.1em;
+ font-weight: 500;
+ margin-bottom: 2px;
+ }
- Log Level
-
-
-
-
-
-
-
-
-
-
-
- - -
-
-
-
-
+ .background {
+ background-color: #fafbfe;
+ }
-
- Publish Wizard
-This form will help you set up a DataId. A DataId is a metadata document containing - important information about your files. This metadata document will make your data more understandable and - reusable for you and other users.
-GROUP INFO
-
+ .code-block {
+ font-family: monospace;
+ background: #f5f5f5;
+ overflow: hidden;
+ margin-top: 1em;
+ }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Group Metadata
-
-
-
-
-
+ .code-block-header {
+ display: flex;
+ justify-content: right;
+ align-items: center;
+ background: #f5f5f5;
+ padding-top: 0.5em;
+ padding-right: 0.5em;
+ font-size: 0.9em;
+ }
-
-
- Name
-
-
-
-
-
-
-
-
-
-
- Name
-
-
- {{
- texts.errors['err_invalid_group_title'] }}
- {{
- texts.errors['warning_group_exists'] }}
-
-
-
- Title
-
-
-
-
-
Abstract
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ You need to create an account in order to register metadata
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
-
+
Group Info
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
Description
-
-
-
+
+
API Input
+
+
+
+
+
+
+
+
+
+
Artifact Info
- -ARTIFACT INFO
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- - {{ texts.errors[error] }} - -
-
-
-
-
-
- -
-
- {{ hint }} -
-
-
-
+
-
-
- Artifact Metadata
-
-
-
-
-
+
+
+
+
-
-
- Name
-
-
-
-
-
-
-
-
-
- Name
-
-
- {{
- texts.errors['err_invalid_artifact_title'] }}
- {{
- texts.errors['warning_artifact_exists'] }}
-
-
-
-
- Title
-
-
- {{
- texts.errors['err_invalid_artifact_label'] }}
-
-
-
-
- Abstract
-
-
-
-
-
-
-
-
-
-
-
- Description
-
-
- {{
- texts.errors['err_invalid_group_description'] }}
-
+
+
+
+
+
- VERSION INFO
-
+
+
+
+
+
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
- Version Metadata
-
-
-
-
-
+ Name
-
-
+
-
-
- {{
- texts.errors['warning_version_exists'] }}
- {{
- texts.errors['err_invalid_version_name'] }}
-
-
-
-
-
-
-
+
+ API Input
+
-
Name
-
-
-
-