Skip to content

#5790 - Import project(s) from the Projects view #5791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StanZGenchev merged 1 commit into from
Mar 25, 2026
+57 −36
Merged

#5790 - Import project(s) from the Projects view #5791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 40 additions & 36 deletions components/ui/view-import/src/main/resources/META-INF/dirigible/view-import/js/import.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,47 +31,51 @@ importView.controller('ImportViewController', ($scope, $window, ViewParameters,
$scope.uploader = new FileUploader({
url: projectImportUrl
});
$scope.importProjectDialog = false;

$scope.initImport = () => {
let params = ViewParameters.get();
const params = ViewParameters.get();
if (params.workspace) $scope.selectedWorkspace = params.workspace;
if (params.container === 'window') {
$scope.inDialog = true;
if (params.importRepository) {
$scope.importRepository = true;
$scope.queueLength = 1;
$scope.uploader.url = TransportService.getSnapshotUrl();
$scope.dropAreaTitle = 'Import repository from zip';
$scope.dropAreaSubtitle = 'Drop snaphot here, or use the "+" button.';
} else {
$scope.uploadPath = params.uploadPath;
if (params.workspace) $scope.selectedWorkspace = params.workspace;
if (params.importType === 'file') {
$scope.inputAccept = '';
$scope.importType = params.importType;
$scope.dropAreaTitle = 'Import files';
$scope.dropAreaSubtitle = 'Drop file(s) here, or use the "+" button.';
$scope.dropAreaMore = `Files will be imported in "${params.uploadPath}"`;
} else if (params.importType === 'data') {
$scope.inputAccept = 'csv';
$scope.importType = params.importType;
$scope.dropAreaTitle = 'Import data files';
$scope.dropAreaSubtitle = 'Drop file(s) here, or use the "+" button.';
$scope.dropAreaMore = `Files will be imported in "${params.table}"`;
} else if (params.importType === 'sql') {
$scope.inputAccept = 'sql';
$scope.importType = params.importType;
$scope.dropAreaTitle = 'Import SQL files';
$scope.dropAreaSubtitle = 'Drop file(s) here, or use the "+" button.';
$scope.dropAreaMore = `Files will be imported in "${params.schema}"`;
$scope.importProjectDialog = params.importType === 'project';
if (!$scope.importProjectDialog) {
if (params.importRepository) {
$scope.importRepository = true;
$scope.queueLength = 1;
$scope.uploader.url = TransportService.getSnapshotUrl();
$scope.dropAreaTitle = 'Import repository from zip';
$scope.dropAreaSubtitle = 'Drop snaphot here, or use the "+" button.';
} else {
$scope.dropAreaTitle = 'Import files from zip';
$scope.dropAreaMore = `Files will be extracted in "${params.uploadPath}"`;
let pathSegments = params.uploadPath.split('/');
$scope.uploader.url = UriBuilder().path(zipImportUrl.split('/')).path(pathSegments).build();
if (pathSegments.length <= 2) $scope.uploader.url += '/%252F';
$scope.uploadPath = params.uploadPath;
if (params.importType === 'file') {
$scope.inputAccept = '';
$scope.importType = params.importType;
$scope.dropAreaTitle = 'Import files';
$scope.dropAreaSubtitle = 'Drop file(s) here, or use the "+" button.';
$scope.dropAreaMore = `Files will be imported in "${params.uploadPath}"`;
} else if (params.importType === 'data') {
$scope.inputAccept = 'csv';
$scope.importType = params.importType;
$scope.dropAreaTitle = 'Import data files';
$scope.dropAreaSubtitle = 'Drop file(s) here, or use the "+" button.';
$scope.dropAreaMore = `Files will be imported in "${params.table}"`;
} else if (params.importType === 'sql') {
$scope.inputAccept = 'sql';
$scope.importType = params.importType;
$scope.dropAreaTitle = 'Import SQL files';
$scope.dropAreaSubtitle = 'Drop file(s) here, or use the "+" button.';
$scope.dropAreaMore = `Files will be imported in "${params.schema}"`;
} else {
$scope.dropAreaTitle = 'Import files from zip';
$scope.dropAreaMore = `Files will be extracted in "${params.uploadPath}"`;
let pathSegments = params.uploadPath.split('/');
$scope.uploader.url = UriBuilder().path(zipImportUrl.split('/')).path(pathSegments).build();
if (pathSegments.length <= 2) $scope.uploader.url += '/%252F';
}
}
$scope.projectsViewId = params.projectsViewId;
}
$scope.projectsViewId = params.projectsViewId;
} else $scope.reloadWorkspaceList();
}

Expand All @@ -89,7 +93,7 @@ importView.controller('ImportViewController', ($scope, $window, ViewParameters,

$scope.uploader.onBeforeUploadItem = (item) => {
if (!$scope.importRepository) {
if (!$scope.inDialog) {
if (!$scope.inDialog || ($scope.inDialog && $scope.importProjectDialog)) {
item.url = UriBuilder().path(projectImportUrl.split('/')).path($scope.selectedWorkspace).build();
} else if ($scope.inDialog && $scope.importType === 'file') {
item.headers = {
Expand All @@ -108,7 +112,7 @@ importView.controller('ImportViewController', ($scope, $window, ViewParameters,
$scope.uploader.onCompleteAll = () => {
if ($scope.importRepository) {
Repository.announceRepositoryModified();
} else if ($scope.inDialog) {
} else if ($scope.inDialog && !$scope.importProjectDialog) {
// Temporary, publishes all files in the import directory, not just imported ones
Workspace.announceWorkspaceChanged({
workspace: $scope.selectedWorkspace,
Expand Down
16 changes: 16 additions & 0 deletions ...nents/ui/view-projects/src/main/resources/META-INF/dirigible/view-projects/js/projects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,10 @@ projectsView.controller('ProjectsViewController', (
id: 'newProject',
label: 'New Project',
leftIconClass: 'sap-icon--create',
}, {
id: 'importProject',
label: 'Import Project',
leftIconClass: 'sap-icon--upload',
separator: true,
});
if (PublisherService.isEnabled()) {
Expand Down Expand Up @@ -673,6 +677,7 @@ projectsView.controller('ProjectsViewController', (
} else if (id === 'paste') {
jstreeWidget.jstree(true).paste(contextMenuNodes[0]);
} else if (id === 'newProject') $scope.createProject();
else if (id === 'importProject') $scope.importProject();
else if (id === 'duplicateProject') {
$scope.duplicateProject(contextMenuNodes[0]);
} else if (id === 'rename') {
Expand Down Expand Up @@ -1254,6 +1259,17 @@ projectsView.controller('ProjectsViewController', (
});
};

$scope.importProject = () => {
Dialogs.showWindow({
hasHeader: true,
id: 'import',
params: {
importType: 'project',
workspace: $scope.selectedWorkspace,
}
});
};

$scope.exportProjects = () => {
TransportService.exportProject($scope.selectedWorkspace, '*');
};
Expand Down
1 change: 1 addition & 0 deletions ...onents/ui/view-projects/src/main/resources/META-INF/dirigible/view-projects/projects.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
<bk-toolbar-overflow>
<bk-button state="transparent" label="Create project" glyph="sap-icon--create" is-overflow="true" ng-click="createProject()"></bk-button>
<bk-button state="transparent" label="Duplicate project" glyph="sap-icon--duplicate" is-overflow="true" ng-click="duplicateProject()"></bk-button>
<bk-button state="transparent" label="Import projects" glyph="sap-icon--upload" is-overflow="true" ng-click="importProject()"></bk-button>
<bk-button state="transparent" label="Export projects" glyph="sap-icon--download-from-cloud" is-overflow="true" ng-click="exportProjects()"></bk-button>
<bk-toolbar-separator></bk-toolbar-separator>
<bk-button state="transparent" label="Create workspace" glyph="sap-icon--add" is-overflow="true" ng-click="createWorkspace()"></bk-button>
Expand Down
Loading