Skip to content

Commit 9180b10

Browse files
authored
Merge pull request #769 from PHOENIXCONTACT/remove/analytics
Removed analytics and replaced by external modules
2 parents 39b69aa + e60f7b5 commit 9180b10

File tree

88 files changed

+254
-18183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+254
-18183
lines changed

MORYX-Framework.sln

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -286,10 +286,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Workplans.Web", "src\
286286
EndProject
287287
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Workplans.Editing.Tests", "src\Tests\Moryx.Workplans.Editing.Tests\Moryx.Workplans.Editing.Tests.csproj", "{EB50C7EF-7092-434B-84C5-93F075D7FA6D}"
288288
EndProject
289-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Analytics.Server", "src\Moryx.Analytics.Server\Moryx.Analytics.Server.csproj", "{58A936FD-D155-4397-B9AC-7E5679546F2A}"
290-
EndProject
291-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Analytics.Web", "src\Moryx.Analytics.Web\Moryx.Analytics.Web.csproj", "{3340BFF4-132F-496C-8D70-6F3800330F7E}"
292-
EndProject
293289
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Operators", "Operators", "{8DF13E64-63FC-44A9-A54C-ADEFC356CDE8}"
294290
EndProject
295291
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Operators", "src\Moryx.Operators\Moryx.Operators.csproj", "{A7D7385D-F4FD-4026-A01F-11D811774327}"
@@ -776,14 +772,6 @@ Global
776772
{EB50C7EF-7092-434B-84C5-93F075D7FA6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
777773
{EB50C7EF-7092-434B-84C5-93F075D7FA6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
778774
{EB50C7EF-7092-434B-84C5-93F075D7FA6D}.Release|Any CPU.Build.0 = Release|Any CPU
779-
{58A936FD-D155-4397-B9AC-7E5679546F2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
780-
{58A936FD-D155-4397-B9AC-7E5679546F2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
781-
{58A936FD-D155-4397-B9AC-7E5679546F2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
782-
{58A936FD-D155-4397-B9AC-7E5679546F2A}.Release|Any CPU.Build.0 = Release|Any CPU
783-
{3340BFF4-132F-496C-8D70-6F3800330F7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
784-
{3340BFF4-132F-496C-8D70-6F3800330F7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
785-
{3340BFF4-132F-496C-8D70-6F3800330F7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
786-
{3340BFF4-132F-496C-8D70-6F3800330F7E}.Release|Any CPU.Build.0 = Release|Any CPU
787775
{A7D7385D-F4FD-4026-A01F-11D811774327}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
788776
{A7D7385D-F4FD-4026-A01F-11D811774327}.Debug|Any CPU.Build.0 = Debug|Any CPU
789777
{A7D7385D-F4FD-4026-A01F-11D811774327}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -942,8 +930,6 @@ Global
942930
{7A3B378A-60B6-439F-95D7-654E6B338B49} = {2FAE7DFA-7DD1-4DD8-A1C8-6B630AEC3898}
943931
{A5B9A9C6-10B8-4204-8F9C-DB69F671FA30} = {2FAE7DFA-7DD1-4DD8-A1C8-6B630AEC3898}
944932
{EB50C7EF-7092-434B-84C5-93F075D7FA6D} = {0A466330-6ED6-4861-9C94-31B1949CDDB9}
945-
{58A936FD-D155-4397-B9AC-7E5679546F2A} = {EFA3F41A-1DEF-4E49-B3F0-D34DFA4BD56B}
946-
{3340BFF4-132F-496C-8D70-6F3800330F7E} = {EFA3F41A-1DEF-4E49-B3F0-D34DFA4BD56B}
947933
{A7D7385D-F4FD-4026-A01F-11D811774327} = {8DF13E64-63FC-44A9-A54C-ADEFC356CDE8}
948934
{5F2DA8C5-9C92-4F50-AEA0-F646D6BAB2E6} = {8DF13E64-63FC-44A9-A54C-ADEFC356CDE8}
949935
{0A1E7D04-BF6D-4C8D-A967-C19CDA0E3C90} = {8DF13E64-63FC-44A9-A54C-ADEFC356CDE8}

docs/articles/launcher/Launcher.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Launcher
2+
3+
## Sorting
4+
5+
To sort your modules in the launcher, you can use the `SortIndex` property within the `appsettings.json`. This property allows you to define the order of modules by assigning them an index value. Modules with lower index values will appear before those with higher values.
6+
7+
````json
8+
{
9+
"Shell": {
10+
"SortIndex": {
11+
"moduleA-route": 10,
12+
"moduleB-route": 20,
13+
"moduleC-route": 15
14+
}
15+
}
16+
}
17+
````
18+
19+
## External Modules
20+
21+
To define external modules in the launcher configuration, you can use the `ExternalModules` property within the `appsettings.json`. This allows you to specify
22+
modules that should be loaded from external sources rather than being bundled with your application.
23+
24+
External modules are integrated with the `<embed>` tag; the external web-page must support being embedded in an iframe.
25+
26+
````json
27+
{
28+
"Shell": {
29+
"SortIndex": {
30+
"example": 10
31+
},
32+
"ExternalModules": [
33+
{
34+
"Route": "example",
35+
"Title": "Example",
36+
"Url": "http://www.example.com",
37+
"Icon": "globe"
38+
}
39+
]
40+
}
41+
}
42+
````

docs/migrations/v8_to_v10.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ With MORYX 10, several changes have been made to the data model to improve perfo
4545
- The `ProductFile` was removed completly.
4646

4747

48+
## Removal of Modules-Analytics
49+
50+
The analytics module was doing nothing and the web module was replaced by supporting external modules in `Launcher`. Its now supported to embed external web-pages into the shell. Refer to the [Launcher](/docs/articles/launcher/Launcher.md) documentation for more information.
51+
4852
## Rarely used features removed
4953

5054
These feature were infrequently used and has been removed to simplify the codebase.

src/Moryx.Analytics.Server/DashboardInformation.cs

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/Moryx.Analytics.Server/ModuleController/ModuleConfig.cs

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/Moryx.Analytics.Server/ModuleController/ModuleConsole.cs

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/Moryx.Analytics.Server/ModuleController/ModuleController.cs

Lines changed: 0 additions & 55 deletions
This file was deleted.

src/Moryx.Analytics.Server/Moryx.Analytics.Server.csproj

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/Moryx.Analytics.Server/README.md

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/Moryx.Analytics.Web/.gitignore

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)