From de19ab85b905462e4e83a1cc11bb97e6c8c3200e Mon Sep 17 00:00:00 2001
From: alaskowski <alaskowski@ethz.ch>
Date: Mon, 20 Feb 2023 11:55:55 +0100
Subject: [PATCH] SSDM-13365: renamed module ui-admin into admin
---
.../installer/izpack/SetEnableTechnologiesVariableAction.java | 2 +-
core-plugin-openbis/build.gradle | 2 +-
.../eln-lims-life-sciences/1/core-plugin.properties | 2 +-
.../dist/core-plugins/search-store/1/core-plugin.properties | 2 +-
.../servers/common/core-plugins/core-plugins.properties | 2 +-
.../servers/common/core-plugins/ui-admin | 1 -
ui-admin/build.gradle | 2 +-
ui-admin/env/dev/Vagrantfile | 2 +-
ui-admin/index.html | 2 +-
ui-admin/package.json | 2 +-
.../1/as/services/admin-service}/plugin.properties | 0
.../1/as/services/admin-service}/script.py | 0
.../1/as/services/xls-export/plugin.properties | 0
.../1/as/services/xls-export/xls-export.py | 0
.../1/as/services/xls-import/plugin.properties | 0
.../1/as/services/xls-import/xls-import.py | 0
.../core-plugins/admin/1/as/webapps/admin}/plugin.properties | 0
.../{ui-admin => admin}/1/dss/.keep_me_do_not_delete_me | 0
.../ui-admin/1/as/webapps/ui-admin/plugin.properties | 1 -
ui-admin/src/js/common/consts/ids.js | 4 ++--
.../src/core-plugins/eln-lims/1/core-plugin.properties | 2 +-
21 files changed, 12 insertions(+), 14 deletions(-)
delete mode 120000 test-api-openbis-javascript/servers/common/core-plugins/ui-admin
rename ui-admin/src/core-plugins/{ui-admin/1/as/services/ui-admin-service => admin/1/as/services/admin-service}/plugin.properties (100%)
rename ui-admin/src/core-plugins/{ui-admin/1/as/services/ui-admin-service => admin/1/as/services/admin-service}/script.py (100%)
rename ui-admin/src/core-plugins/{ui-admin => admin}/1/as/services/xls-export/plugin.properties (100%)
rename ui-admin/src/core-plugins/{ui-admin => admin}/1/as/services/xls-export/xls-export.py (100%)
rename ui-admin/src/core-plugins/{ui-admin => admin}/1/as/services/xls-import/plugin.properties (100%)
rename ui-admin/src/core-plugins/{ui-admin => admin}/1/as/services/xls-import/xls-import.py (100%)
rename {core-plugin-openbis/dist/core-plugins/ui-admin/1/as/webapps/ui-admin => ui-admin/src/core-plugins/admin/1/as/webapps/admin}/plugin.properties (100%)
rename ui-admin/src/core-plugins/{ui-admin => admin}/1/dss/.keep_me_do_not_delete_me (100%)
delete mode 100644 ui-admin/src/core-plugins/ui-admin/1/as/webapps/ui-admin/plugin.properties
diff --git a/app-openbis-installer/source/java/ch/systemsx/cisd/openbis/installer/izpack/SetEnableTechnologiesVariableAction.java b/app-openbis-installer/source/java/ch/systemsx/cisd/openbis/installer/izpack/SetEnableTechnologiesVariableAction.java
index 312689cd131..d0686b80206 100644
--- a/app-openbis-installer/source/java/ch/systemsx/cisd/openbis/installer/izpack/SetEnableTechnologiesVariableAction.java
+++ b/app-openbis-installer/source/java/ch/systemsx/cisd/openbis/installer/izpack/SetEnableTechnologiesVariableAction.java
@@ -39,7 +39,7 @@ import ch.systemsx.cisd.common.shared.basic.string.CommaSeparatedListBuilder;
public class SetEnableTechnologiesVariableAction implements PanelAction
{
static final String[] MODULES = { "monitoring-support", "dropbox-monitor", "dataset-uploader",
- "dataset-file-search", "xls-import", "search-store", "openbis-sync", "ui-admin" };
+ "dataset-file-search", "xls-import", "search-store", "openbis-sync", "admin" };
static final String ENABLED_TECHNOLOGIES_VARNAME = "ENABLED_TECHNOLOGIES";
diff --git a/core-plugin-openbis/build.gradle b/core-plugin-openbis/build.gradle
index f258f6b371d..38b76d30e34 100644
--- a/core-plugin-openbis/build.gradle
+++ b/core-plugin-openbis/build.gradle
@@ -493,7 +493,7 @@ task clientsAndApis(type: Zip, dependsOn: [dssClientZip, queryApiZip, apiV3Zip,
}
task deleteOpenbisNgUi(type: Delete) {
- delete 'dist/core-plugins/ui-admin'
+ delete 'dist/core-plugins/admin'
}
task copyOpenbisNgUiToCorePlugins(type: Copy, dependsOn: [deleteOpenbisNgUi, ':ui-admin:copyWebApp']) {
diff --git a/core-plugin-openbis/dist/core-plugins/eln-lims-life-sciences/1/core-plugin.properties b/core-plugin-openbis/dist/core-plugins/eln-lims-life-sciences/1/core-plugin.properties
index 56168197e5a..e268d1fd738 100644
--- a/core-plugin-openbis/dist/core-plugins/eln-lims-life-sciences/1/core-plugin.properties
+++ b/core-plugin-openbis/dist/core-plugins/eln-lims-life-sciences/1/core-plugin.properties
@@ -1 +1 @@
-required-plugins=ui-admin:services
\ No newline at end of file
+required-plugins=admin:services
\ No newline at end of file
diff --git a/core-plugin-openbis/dist/core-plugins/search-store/1/core-plugin.properties b/core-plugin-openbis/dist/core-plugins/search-store/1/core-plugin.properties
index 56168197e5a..e268d1fd738 100644
--- a/core-plugin-openbis/dist/core-plugins/search-store/1/core-plugin.properties
+++ b/core-plugin-openbis/dist/core-plugins/search-store/1/core-plugin.properties
@@ -1 +1 @@
-required-plugins=ui-admin:services
\ No newline at end of file
+required-plugins=admin:services
\ No newline at end of file
diff --git a/test-api-openbis-javascript/servers/common/core-plugins/core-plugins.properties b/test-api-openbis-javascript/servers/common/core-plugins/core-plugins.properties
index a7ab67da3b7..7d9272995b3 100644
--- a/test-api-openbis-javascript/servers/common/core-plugins/core-plugins.properties
+++ b/test-api-openbis-javascript/servers/common/core-plugins/core-plugins.properties
@@ -1 +1 @@
-enabled-modules=screening, illumina-ngs, tests, tests-data-import, eln-lims, eln-lims-life-sciences, ui-admin, search-store
+enabled-modules=screening, illumina-ngs, tests, tests-data-import, eln-lims, eln-lims-life-sciences, admin, search-store
diff --git a/test-api-openbis-javascript/servers/common/core-plugins/ui-admin b/test-api-openbis-javascript/servers/common/core-plugins/ui-admin
deleted file mode 120000
index 392751d957b..00000000000
--- a/test-api-openbis-javascript/servers/common/core-plugins/ui-admin
+++ /dev/null
@@ -1 +0,0 @@
-../../../../ui-admin/src/core-plugins/ui-admin
\ No newline at end of file
diff --git a/ui-admin/build.gradle b/ui-admin/build.gradle
index f11bc515299..3834878da5c 100644
--- a/ui-admin/build.gradle
+++ b/ui-admin/build.gradle
@@ -28,7 +28,7 @@ task copyCorePlugins(type: Copy) {
task copyWebApp(type: Copy) {
from file('build/js')
- into file('build/core-plugins/ui-admin/1/as/webapps/ui-admin/html')
+ into file('build/core-plugins/admin/1/as/webapps/admin/html')
}
task test {
diff --git a/ui-admin/env/dev/Vagrantfile b/ui-admin/env/dev/Vagrantfile
index 8d795d848fa..d452285ad99 100644
--- a/ui-admin/env/dev/Vagrantfile
+++ b/ui-admin/env/dev/Vagrantfile
@@ -8,7 +8,7 @@ Vagrant.configure("2") do |config|
config.vm.provider "virtualbox" do |v|
v.memory = 4096
v.cpus = 1
- v.name = "ui-admin"
+ v.name = "admin"
v.customize ['modifyvm', :id, '--natnet1', '192.168.222.0/24']
end
diff --git a/ui-admin/index.html b/ui-admin/index.html
index 2f83fb57a0e..469ed046c54 100644
--- a/ui-admin/index.html
+++ b/ui-admin/index.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en" style="height: 100%">
<head>
- <title>openBIS NG Admin</title>
+ <title>openBIS Admin</title>
<meta charset="utf-8" />
<link rel="shortcut icon" href="#" />
<style>
diff --git a/ui-admin/package.json b/ui-admin/package.json
index da2cee0f3a5..94154637c6e 100644
--- a/ui-admin/package.json
+++ b/ui-admin/package.json
@@ -1,5 +1,5 @@
{
- "name": "ui-admin",
+ "name": "admin",
"version": "1.0.0",
"description": "React-based UI proto for openBIS",
"author": "Antti Luomi",
diff --git a/ui-admin/src/core-plugins/ui-admin/1/as/services/ui-admin-service/plugin.properties b/ui-admin/src/core-plugins/admin/1/as/services/admin-service/plugin.properties
similarity index 100%
rename from ui-admin/src/core-plugins/ui-admin/1/as/services/ui-admin-service/plugin.properties
rename to ui-admin/src/core-plugins/admin/1/as/services/admin-service/plugin.properties
diff --git a/ui-admin/src/core-plugins/ui-admin/1/as/services/ui-admin-service/script.py b/ui-admin/src/core-plugins/admin/1/as/services/admin-service/script.py
similarity index 100%
rename from ui-admin/src/core-plugins/ui-admin/1/as/services/ui-admin-service/script.py
rename to ui-admin/src/core-plugins/admin/1/as/services/admin-service/script.py
diff --git a/ui-admin/src/core-plugins/ui-admin/1/as/services/xls-export/plugin.properties b/ui-admin/src/core-plugins/admin/1/as/services/xls-export/plugin.properties
similarity index 100%
rename from ui-admin/src/core-plugins/ui-admin/1/as/services/xls-export/plugin.properties
rename to ui-admin/src/core-plugins/admin/1/as/services/xls-export/plugin.properties
diff --git a/ui-admin/src/core-plugins/ui-admin/1/as/services/xls-export/xls-export.py b/ui-admin/src/core-plugins/admin/1/as/services/xls-export/xls-export.py
similarity index 100%
rename from ui-admin/src/core-plugins/ui-admin/1/as/services/xls-export/xls-export.py
rename to ui-admin/src/core-plugins/admin/1/as/services/xls-export/xls-export.py
diff --git a/ui-admin/src/core-plugins/ui-admin/1/as/services/xls-import/plugin.properties b/ui-admin/src/core-plugins/admin/1/as/services/xls-import/plugin.properties
similarity index 100%
rename from ui-admin/src/core-plugins/ui-admin/1/as/services/xls-import/plugin.properties
rename to ui-admin/src/core-plugins/admin/1/as/services/xls-import/plugin.properties
diff --git a/ui-admin/src/core-plugins/ui-admin/1/as/services/xls-import/xls-import.py b/ui-admin/src/core-plugins/admin/1/as/services/xls-import/xls-import.py
similarity index 100%
rename from ui-admin/src/core-plugins/ui-admin/1/as/services/xls-import/xls-import.py
rename to ui-admin/src/core-plugins/admin/1/as/services/xls-import/xls-import.py
diff --git a/core-plugin-openbis/dist/core-plugins/ui-admin/1/as/webapps/ui-admin/plugin.properties b/ui-admin/src/core-plugins/admin/1/as/webapps/admin/plugin.properties
similarity index 100%
rename from core-plugin-openbis/dist/core-plugins/ui-admin/1/as/webapps/ui-admin/plugin.properties
rename to ui-admin/src/core-plugins/admin/1/as/webapps/admin/plugin.properties
diff --git a/ui-admin/src/core-plugins/ui-admin/1/dss/.keep_me_do_not_delete_me b/ui-admin/src/core-plugins/admin/1/dss/.keep_me_do_not_delete_me
similarity index 100%
rename from ui-admin/src/core-plugins/ui-admin/1/dss/.keep_me_do_not_delete_me
rename to ui-admin/src/core-plugins/admin/1/dss/.keep_me_do_not_delete_me
diff --git a/ui-admin/src/core-plugins/ui-admin/1/as/webapps/ui-admin/plugin.properties b/ui-admin/src/core-plugins/ui-admin/1/as/webapps/ui-admin/plugin.properties
deleted file mode 100644
index 9a94ff03bf0..00000000000
--- a/ui-admin/src/core-plugins/ui-admin/1/as/webapps/ui-admin/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-webapp-folder = html
diff --git a/ui-admin/src/js/common/consts/ids.js b/ui-admin/src/js/common/consts/ids.js
index 666f0ce5949..62b8bd61aff 100644
--- a/ui-admin/src/js/common/consts/ids.js
+++ b/ui-admin/src/js/common/consts/ids.js
@@ -1,6 +1,6 @@
// app
-const WEB_APP_ID = 'ui-admin'
-const WEB_APP_SERVICE = 'ui-admin-service'
+const WEB_APP_ID = 'admin'
+const WEB_APP_SERVICE = 'admin-service'
const EXPORT_SERVICE = 'xls-export'
// grids
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/core-plugin.properties b/ui-eln-lims/src/core-plugins/eln-lims/1/core-plugin.properties
index 56168197e5a..e268d1fd738 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/core-plugin.properties
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/core-plugin.properties
@@ -1 +1 @@
-required-plugins=ui-admin:services
\ No newline at end of file
+required-plugins=admin:services
\ No newline at end of file
--
GitLab