SSDM-13365: renamed module ui-admin into admin

de19ab85 · Adam Laskowski · 35f6fdc8 · de19ab85 · de19ab85 · de19ab85
Commit de19ab85 authored 2 years ago by Adam Laskowski
--- 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";

--- 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']) {

--- 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
-required-plugins=ui-admin:services
+required-plugins=admin:services
\ No newline at end of file
--- 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
-required-plugins=ui-admin:services
+required-plugins=admin:services
\ No newline at end of file
--- a/test-api-openbis-javascript/servers/common/core-plugins/core-plugins.properties
+++ b/test-api-openbis-javascript/servers/common/core-plugins/core-plugins.properties
-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
--- a/test-api-openbis-javascript/servers/common/core-plugins/ui-admin
+++ b/test-api-openbis-javascript/servers/common/core-plugins/ui-admin
-../../../../ui-admin/src/core-plugins/ui-admin
\ No newline at end of file
--- 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 {

--- 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

--- a/ui-admin/index.html
+++ b/ui-admin/index.html
 <!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>

--- a/ui-admin/package.json
+++ b/ui-admin/package.json
 {
-  "name": "ui-admin",
+  "name": "admin",
  "version": "1.0.0",
  "description": "React-based UI proto for openBIS",
  "author": "Antti Luomi",

--- a/ui-admin/src/core-plugins/ui-admin/1/as/services/ui-admin-service/plugin.properties
+++ b/ui-admin/src/core-plugins/ui-admin/1/as/services/ui-admin-service/plugin.properties
--- a/ui-admin/src/core-plugins/ui-admin/1/as/services/ui-admin-service/script.py
+++ b/ui-admin/src/core-plugins/ui-admin/1/as/services/ui-admin-service/script.py
--- a/ui-admin/src/core-plugins/ui-admin/1/as/services/xls-export/plugin.properties
+++ b/ui-admin/src/core-plugins/ui-admin/1/as/services/xls-export/plugin.properties
--- a/ui-admin/src/core-plugins/ui-admin/1/as/services/xls-export/xls-export.py
+++ b/ui-admin/src/core-plugins/ui-admin/1/as/services/xls-export/xls-export.py
--- a/ui-admin/src/core-plugins/ui-admin/1/as/services/xls-import/plugin.properties
+++ b/ui-admin/src/core-plugins/ui-admin/1/as/services/xls-import/plugin.properties
--- a/ui-admin/src/core-plugins/ui-admin/1/as/services/xls-import/xls-import.py
+++ b/ui-admin/src/core-plugins/ui-admin/1/as/services/xls-import/xls-import.py
--- a/core-plugin-openbis/dist/core-plugins/ui-admin/1/as/webapps/ui-admin/plugin.properties
+++ b/core-plugin-openbis/dist/core-plugins/ui-admin/1/as/webapps/ui-admin/plugin.properties
--- a/ui-admin/src/core-plugins/ui-admin/1/dss/.keep_me_do_not_delete_me
+++ b/ui-admin/src/core-plugins/ui-admin/1/dss/.keep_me_do_not_delete_me
--- 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
-webapp-folder = html
--- a/ui-admin/src/js/common/consts/ids.js
+++ b/ui-admin/src/js/common/consts/ids.js
 // app
-const WEB_APP_ID = 'ui-admin'
+const WEB_APP_ID = 'admin'
-const WEB_APP_SERVICE = 'ui-admin-service'
+const WEB_APP_SERVICE = 'admin-service'
 const EXPORT_SERVICE = 'xls-export'
 // grids