удаление записи о папке пользователя на машине через админку. нужно будет крайне редко, если например обновились модули. Пока не реализована очистка на целевой машине, но возможно и не понадобится.

This commit is contained in:
2023-12-05 19:25:17 +03:00
parent 9beadaf95c
commit 2b52763c02
8 changed files with 35 additions and 13 deletions

15
.idea/workspace.xml generated
View File

@@ -7,18 +7,13 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SubscriberWorkspacesMenuBar/SubscriberWorkspacesMenuBar.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSubscriberWorkspace.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Current.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SubscriberWorkspacesMenuBar/SubscriberWorkspacesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SubscriberWorkspacesMenuBar/SubscriberWorkspacesMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/SubscriberWorkspace/SubscriberWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/SubscriberWorkspace/SubscriberWorkspace.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Subscribes/Subscriber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/Subscriber.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Subscribes/SubsribersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/SubsribersDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Repository/Subscribes/SubsribersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/SubsribersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Subscribes/UI/SubscriberForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/UI/SubscriberForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeBugReports.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/TestsSupervisor_2022.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TestsSupervisor_2022.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />

View File

@@ -25,7 +25,7 @@
"InstructionPath": "", "InstructionPath": "",
"PerformanceAnalyzerPath": "", "PerformanceAnalyzerPath": "",
"ComponentsBackUpsCount": 10, "ComponentsBackUpsCount": 10,
"TestingKernels": 28, "TestingKernels": 64,
"AutoCheckTesting": false, "AutoCheckTesting": false,
"CheckTestingIntervalSeconds": 10, "CheckTestingIntervalSeconds": 10,
"EmailOnTestingProgress": true "EmailOnTestingProgress": true

View File

@@ -1,7 +1,8 @@
package Common.UI.Menus_2023.SubscriberWorkspacesMenuBar; package Common.UI.Menus_2023.SubscriberWorkspacesMenuBar;
import Common.UI.Menus_2023.DataMenuBar; import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class SubscriberWorkspacesMenuBar extends DataMenuBar { public class SubscriberWorkspacesMenuBar extends DataMenuBar {
public SubscriberWorkspacesMenuBar() { public SubscriberWorkspacesMenuBar() {
super("рабочие пространства"); super("рабочие пространства", PassCode_2021.DeleteSubscriberWorkspace);
} }
} }

View File

@@ -62,7 +62,7 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() { public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>(); LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
//- //-
res.put(SubscriberWorkspace.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE)); res.put(SubscriberWorkspace.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
return res; return res;
} }
} }

View File

@@ -0,0 +1,10 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import Repository.Server.ComponentsServer;
import Repository.SubscriberWorkspace.SubscriberWorkspace;
import Visual_DVM_2021.Passes.Server.DeleteServerObject;
public class DeleteSubscriberWorkspace extends DeleteServerObject<ComponentsServer, SubscriberWorkspace> {
public DeleteSubscriberWorkspace() {
super(Global.componentsServer, SubscriberWorkspace.class);
}
}

View File

@@ -27,6 +27,8 @@ public class SynchronizeBugReports extends ComponentsRepositoryPass<Object> {
protected void showPreparation() throws Exception { protected void showPreparation() throws Exception {
server.db.bugReports.SaveLastSelections(); server.db.bugReports.SaveLastSelections();
server.db.bugReports.ClearUI(); server.db.bugReports.ClearUI();
server.db.subscribers.ClearUI();
server.db.workspaces.ClearUI();
} }
@Override @Override
protected void ServerAction() throws Exception { protected void ServerAction() throws Exception {
@@ -48,6 +50,8 @@ public class SynchronizeBugReports extends ComponentsRepositoryPass<Object> {
if (UI.HasMainWindow()) { if (UI.HasMainWindow()) {
UI.getMainWindow().getCallbackWindow().ShowBugReports(); UI.getMainWindow().getCallbackWindow().ShowBugReports();
Global.componentsServer.db.bugReports.RestoreLastSelections(); Global.componentsServer.db.bugReports.RestoreLastSelections();
server.db.subscribers.RestoreLastSelections();
server.db.workspaces.RestoreLastSelections();
} }
} }
} }

View File

@@ -304,12 +304,15 @@ public enum PassCode_2021 {
CreateTestsFromFiles, CreateTestsFromFiles,
CreateGroupFromFiles, CreateGroupFromFiles,
DeleteTasksPackage, DeleteTasksPackage,
DeleteSubscriberWorkspace,
//-> //->
TestPass; TestPass;
public String getDescription() { public String getDescription() {
switch (this) { switch (this) {
case Undefined: case Undefined:
return "?"; return "?";
case DeleteSubscriberWorkspace:
return "Удалить рабочее пространство пользователя";
case DeleteTasksPackage: case DeleteTasksPackage:
return "Удалить пакет задач"; return "Удалить пакет задач";
case CreateGroupFromFiles: case CreateGroupFromFiles:

View File

@@ -371,6 +371,9 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
Pass_2021.passes.get(PassCode_2021.EditSubscriber).setControlsVisible(false); Pass_2021.passes.get(PassCode_2021.EditSubscriber).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.DeleteSubscriber).setControlsVisible(false); Pass_2021.passes.get(PassCode_2021.DeleteSubscriber).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.DownloadAllBugReportsArchives).setControlsVisible(false); Pass_2021.passes.get(PassCode_2021.DownloadAllBugReportsArchives).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.DeleteSubscriberWorkspace).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.InstallServerSapfor).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.DeleteServerSapfor).setControlsVisible(false);
} }
private void setDeveloperRights() { private void setDeveloperRights() {
UnlockMyOnly(); UnlockMyOnly();
@@ -378,6 +381,9 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
Pass_2021.passes.get(PassCode_2021.EditSubscriber).setControlsVisible(false); Pass_2021.passes.get(PassCode_2021.EditSubscriber).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.DeleteSubscriber).setControlsVisible(false); Pass_2021.passes.get(PassCode_2021.DeleteSubscriber).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.DownloadAllBugReportsArchives).setControlsVisible(true); Pass_2021.passes.get(PassCode_2021.DownloadAllBugReportsArchives).setControlsVisible(true);
Pass_2021.passes.get(PassCode_2021.DeleteSubscriberWorkspace).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.InstallServerSapfor).setControlsVisible(false);
Pass_2021.passes.get(PassCode_2021.DeleteServerSapfor).setControlsVisible(false);
} }
@Override @Override
public void setAdminRights() { public void setAdminRights() {
@@ -386,6 +392,9 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
Pass_2021.passes.get(PassCode_2021.EditSubscriber).setControlsVisible(true); Pass_2021.passes.get(PassCode_2021.EditSubscriber).setControlsVisible(true);
Pass_2021.passes.get(PassCode_2021.DeleteSubscriber).setControlsVisible(true); Pass_2021.passes.get(PassCode_2021.DeleteSubscriber).setControlsVisible(true);
Pass_2021.passes.get(PassCode_2021.DownloadAllBugReportsArchives).setControlsVisible(true); Pass_2021.passes.get(PassCode_2021.DownloadAllBugReportsArchives).setControlsVisible(true);
Pass_2021.passes.get(PassCode_2021.DeleteSubscriberWorkspace).setControlsVisible(true);
Pass_2021.passes.get(PassCode_2021.InstallServerSapfor).setControlsVisible(true);
Pass_2021.passes.get(PassCode_2021.DeleteServerSapfor).setControlsVisible(true);
} }
@Override @Override
public void ShowAccount() { public void ShowAccount() {