diff --git a/README.md b/README.md index 3027d887..9c86b5b9 100644 --- a/README.md +++ b/README.md @@ -163,6 +163,7 @@ docker run -it --rm clio reg-web-app -help - [Get package list](#get-package-list) - [Set package version](#set-package-version) - [Set application version](#set-application-version) + - [Set application icon](#set-application-icon) - [NuGet Packages](#nuget-packages) - [Pack NuGet package](#pack-nuget-package) - [Push NuGet package](#push-nuget-package) @@ -423,6 +424,29 @@ clio set-app-versin -f -v ``` + +## Set Application Icon + +The `set-app-icon` command is used to set the icon for a specified application +by updating the `app-descriptor.json` file. + +### Usage + +```bash +clio set-app-icon [options] +``` +-p, --app-name (required): The name or code of the application. +-i, --app-icon (required): The path to the SVG icon file to be set. +-f, --package-folder (required): The path to the folder containing the application packages. + +Examples +Set the icon for an application with a specified name: + +```bash +clio set-app-icon -p MyAppName -i /path/to/icon.svg -f /path/to/package/folder +``` + + ## Enable/Disable pkg hotfix mode To see full description about Hot Fix mode visit [Creatio Academy](https://academy.creatio.com/docs/8.x/dev/development-on-creatio-platform/development-tools/delivery/hotfix-mode diff --git a/clio.tests/Command/ApplicationCommand/SetApplicationIconCommand.Tests.cs b/clio.tests/Command/ApplicationCommand/SetApplicationIconCommand.Tests.cs index a13aa293..f0b699d8 100644 --- a/clio.tests/Command/ApplicationCommand/SetApplicationIconCommand.Tests.cs +++ b/clio.tests/Command/ApplicationCommand/SetApplicationIconCommand.Tests.cs @@ -1,72 +1,48 @@ using System; -using System.Collections.Generic; using System.IO; -using System.IO.Abstractions.TestingHelpers; -using System.Json; using Autofac; using Clio.Command.ApplicationCommand; using Clio.ComposableApplication; -using FluentAssertions; -using ICSharpCode.SharpZipLib.Zip; using NSubstitute; using NUnit.Framework; -namespace Clio.Tests.Command.ApplicationCommand +namespace Clio.Tests.Command.ApplicationCommand; + +internal class SetApplicationIconCommandTestCase : BaseCommandTests { - internal class SetApplicationIconCommandTestCase : BaseCommandTests - { - private static string mockPackageFolderPath = Path.Combine("C:", "MockPackageFolder"); - private static string mockPackageAppDescriptorPath = Path.Combine(mockPackageFolderPath, "Files", "app-descriptor.json"); - private static string mockWorspacePath = Path.Combine("C:", "MockWorkspaceFolder"); - private static string mockWorkspaceAppPackageFolderPath = Path.Combine(mockWorspacePath, "packages", "IFrameSample"); - private static string mockWorkspaceAppDescriptorPath = Path.Combine(mockWorkspaceAppPackageFolderPath, "Files", "app-descriptor.json"); + #region Fields: Private + + private static readonly string MockWorkspacePath = Path.Combine("C:", "MockWorkspaceFolder"); - private static MockFileSystem CreateFs(string filePath, string packagePath) { - string originClioSourcePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory); - string appDescriptorExamplesDescriptorPath = Path.Combine(originClioSourcePath, "Examples", "AppDescriptors", filePath); - string mockAppDescriptorFilePath = Path.Combine(packagePath, "Files", "app-descriptor.json"); - return new MockFileSystem(new Dictionary { - { - mockAppDescriptorFilePath, - new MockFileData(File.ReadAllText(appDescriptorExamplesDescriptorPath)) - } - }); - } + private static readonly string MockWorkspaceAppPackageFolderPath + = Path.Combine(MockWorkspacePath, "packages", "IFrameSample"); - private static MockFileSystem CreateFs(Dictionary appDescriptors) { - string originClioSourcePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory); - MockFileSystem mockFileSystem = new MockFileSystem(); - foreach (var appDescriptor in appDescriptors) { - string appDescriptorExamplesDescriptorPath = Path.Combine(originClioSourcePath, "Examples", "AppDescriptors", appDescriptor.Value); - string mockAppDescriptorJsonPath = Path.Combine(mockWorspacePath, "packages", appDescriptor.Key, "Files", "app-descriptor.json"); - mockFileSystem.AddFile(mockAppDescriptorJsonPath, new MockFileData(File.ReadAllText(appDescriptorExamplesDescriptorPath))); - } - return mockFileSystem; - } + private IComposableApplicationManager _composableApplicationManager; - private MockFileSystem _fileSystem; - private IComposableApplicationManager composableApplicationManager; + #endregion - protected override void AdditionalRegistrations(ContainerBuilder containerBuilder) { - composableApplicationManager = Substitute.For(); - containerBuilder.RegisterInstance(composableApplicationManager); - base.AdditionalRegistrations(containerBuilder); - } + #region Methods: Protected - [Test] - public void SetApplicationIconCommand_CallsComposableAppmanager() { - string iconPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Files", "icon.svg"); - string appName = "ExampleAppName"; - var command = Container.Resolve(); - command.Execute(new SetApplicationIconOption { - IconPath = iconPath, - WorspaceFolderPath = mockWorspacePath, - PackageFolderPath = mockWorkspaceAppPackageFolderPath, - AppName = appName - }); - composableApplicationManager.Received(1).SetIcon(mockWorkspaceAppPackageFolderPath, iconPath, appName); - } + protected override void AdditionalRegistrations(ContainerBuilder containerBuilder){ + _composableApplicationManager = Substitute.For(); + containerBuilder.RegisterInstance(_composableApplicationManager); + base.AdditionalRegistrations(containerBuilder); + } + #endregion + + [Test] + public void SetApplicationIconCommand_CallsComposableAppmanager(){ + string iconPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Files", "icon.svg"); + string appName = "ExampleAppName"; + SetApplicationIconCommand command = Container.Resolve(); + command.Execute(new SetApplicationIconOption { + IconPath = iconPath, + PackageFolderPath = MockWorkspaceAppPackageFolderPath, + AppName = appName + }); + _composableApplicationManager.Received(1).SetIcon(MockWorkspaceAppPackageFolderPath, iconPath, appName); } -} + +} \ No newline at end of file diff --git a/clio.tests/Command/ApplicationCommand/SetApplicationVersionCommand.Tests.cs b/clio.tests/Command/ApplicationCommand/SetApplicationVersionCommand.Tests.cs index f297f646..50fa2c75 100644 --- a/clio.tests/Command/ApplicationCommand/SetApplicationVersionCommand.Tests.cs +++ b/clio.tests/Command/ApplicationCommand/SetApplicationVersionCommand.Tests.cs @@ -51,7 +51,7 @@ private static MockFileSystem CreateFs(Dictionary appDescriptors public void SetVersion_WhenWorkspaceContainsOneApplication(string descriptorPath) { _fileSystem = CreateFs(descriptorPath, mockWorkspaceAppPackageFolderPath); string expectedVersion = "8.1.1"; - var composableApplicationManager = new ComposableApplicationManager(_fileSystem); + var composableApplicationManager = new ComposableApplicationManager(_fileSystem, null); var command = new SetApplicationVersionCommand(composableApplicationManager); string worspaceFolderPath = mockWorspacePath; command.Execute(new SetApplicationVersionOption() { @@ -70,7 +70,7 @@ public void SetVersion_ThrowException_WhenWorkspaceContainsMoreThanOneApplicatio appDescriptions.Add("Package1", "app1-app-descriptor.json"); appDescriptions.Add("Package2", "app2-app-descriptor.json"); _fileSystem = CreateFs(appDescriptions); - var composableApplicationManager = new ComposableApplicationManager(_fileSystem); + var composableApplicationManager = new ComposableApplicationManager(_fileSystem, null); var command = new SetApplicationVersionCommand(composableApplicationManager); string expectedVersion = "8.1.1"; string worspaceFolderPath = mockWorspacePath; @@ -87,7 +87,7 @@ public void SetVersion_ThrowExceptionWhenAplicationExtendedAndPackageNotDefined( appDescriptions.Add("Package2", "app1-ext-app-descriptor.json"); _fileSystem = CreateFs(appDescriptions); string expectedVersion = "8.1.1"; - var composableApplicationManager = new ComposableApplicationManager(_fileSystem); + var composableApplicationManager = new ComposableApplicationManager(_fileSystem, null); var command = new SetApplicationVersionCommand(composableApplicationManager); string worspaceFolderPath = mockWorspacePath; var exception = Assert.Throws(() => command.Execute(new SetApplicationVersionOption() { @@ -104,7 +104,7 @@ public void SetVersion_WhenAplicationExtendedAndPackageDefined() { appDescriptions.Add(extendPackageName, "app1-ext-app-descriptor.json"); _fileSystem = CreateFs(appDescriptions); string expectedVersion = "8.1.1"; - var composableApplicationManager = new ComposableApplicationManager(_fileSystem); + var composableApplicationManager = new ComposableApplicationManager(_fileSystem, null); var command = new SetApplicationVersionCommand(composableApplicationManager); string worspaceFolderPath = mockWorspacePath; command.Execute(new SetApplicationVersionOption() { @@ -120,7 +120,7 @@ public void SetVersion_WhenAplicationExtendedAndPackageDefined() { public void SetVersion_WhenSetAppFolderPathForOneApplication(string descriptorPath) { _fileSystem = CreateFs(descriptorPath, mockPackageFolderPath); string expectedVersion = "8.1.1"; - var composableApplicationManager = new ComposableApplicationManager(_fileSystem); + var composableApplicationManager = new ComposableApplicationManager(_fileSystem, null); var command = new SetApplicationVersionCommand(composableApplicationManager); command.Execute(new SetApplicationVersionOption() { Version = expectedVersion, diff --git a/clio.tests/ComposableApplication/ComposableApplicationManagerTestCase.cs b/clio.tests/ComposableApplication/ComposableApplicationManagerTestCase.cs index ed29a3ad..3f8837f4 100644 --- a/clio.tests/ComposableApplication/ComposableApplicationManagerTestCase.cs +++ b/clio.tests/ComposableApplication/ComposableApplicationManagerTestCase.cs @@ -1,10 +1,12 @@ -using System.IO; +using System; +using System.IO; using Autofac; using Clio.ComposableApplication; using Clio.Package; using Clio.Tests.Command; using Clio.Tests.Extensions; using FluentAssertions; +using FluentValidation; using Newtonsoft.Json; using NUnit.Framework; @@ -15,6 +17,8 @@ public class ComposableApplicationManagerTestCase : BaseClioModuleTests #region Constants: Private + private const string IconPath = @"T:\SVG_Icons\Partner.svg"; + private const string PartnerSvgBase64 = "<svg width="229" height="219" viewBox="0 0 229 219" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_173_2)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M102.03 0C87.36 4.62 72.69 9.23 58.03 13.83C59.66 31.74 61.29 49.66 62.91 67.57C74.41 75.19 85.87 82.87 97.44 90.38C101.76 85.43 103.91 84.5 110.48 83.54C109.68 78.37 108.9 73.17 108.14 68L106.99 67.54C97.42 63.61 88.43 54.02 87.11 43.54C85.66 32.04 94.36 26.26 105.13 28.41C116.4 30.65 127.6 41.17 129.83 52.55C131.46 60.95 127.64 68.22 118.82 69.41L116.58 69.71C117.47 74.87 118.34 80 119.19 85.16C125.36 87.64 128.81 90.3 133.36 95.12C141.98 90.52 150.59 85.89 159.19 81.25C155.5 64.62 151.81 48 148.1 31.37C132.75 20.95 117.39 10.51 102.06 0.03L102.04 0.01H102.03V0Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M163.39 86.9499C154.84 91.7899 146.27 96.6299 137.74 101.53C140.6 107.58 141.78 111.43 141.49 118.14C146.24 121.31 151 124.48 155.73 127.67L156.97 126.04C164.16 116.58 177.11 121.7 184.45 128.21C189.18 132.4 192.98 137.89 195.3 143.75C199.88 155.4 198.55 173.46 182.67 172.73C166.54 172.01 153.02 152.11 153.52 136.92L153.56 135.7C148.7 132.51 143.88 129.3 139.04 126.09C135.48 131.15 132.68 132.49 125.87 133.62C128.3 148.03 130.6 162.46 132.97 176.88C152.35 189.55 171.69 202.23 191.1 214.82C203.77 203.29 216.34 191.64 228.97 180.09C223.31 160.01 217.68 139.91 212.02 119.82C195.79 108.9 179.59 97.9199 163.38 86.9599V86.9399L163.39 86.9499Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M103.46 122.91C98.86 125.58 94.23 128.21 89.61 130.83L90.22 132.55C96.21 149.59 87.09 168.52 67.63 167.71C50.76 167.01 36.81 151.43 36.18 134.87C35.59 119.53 46.88 107.78 62.36 109.41C69.74 110.19 76.55 113.86 81.72 119.11L82.87 120.28C87.52 117.78 92.18 115.27 96.87 112.81C94.55 106.3 93.77 102.39 95.16 95.5601C83.53 87.8801 71.87 80.2201 60.22 72.5701C41.08 80.7701 21.95 88.9801 2.82996 97.2101V171.66C25.49 186.03 48.13 200.4 70.85 214.7C89.15 201.89 107.36 188.96 125.65 176.13C123.5 161.68 121.31 147.26 119.22 132.81C112.28 130.64 108.5 127.99 103.46 122.93V122.91Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M102.68 1.06006C88.9 5.38006 75.14 9.74006 61.37 14.0401C62.91 31.0301 64.47 47.9901 65.99 64.9801C76.65 72.0501 87.31 79.2001 98.03 86.1801C100.76 83.0601 104.54 81.0101 108.99 80.3601C108.36 76.2601 107.77 72.2201 107.15 68.2101C96.26 63.7401 87.29 53.2301 85.94 42.4501C84.38 29.9701 93.77 22.3501 106.54 24.9101C118.93 27.3801 130.61 38.7401 132.95 50.7801C134.95 61.1301 129.54 68.9301 120.08 70.2101C120.77 74.1601 121.43 78.1701 122.12 82.2301C126.79 84.1001 131.15 87.2201 134.79 91.0601C142.43 86.9801 150.05 82.8601 157.69 78.7701C154.19 62.9501 150.66 47.1501 147.16 31.3501C132.33 21.2801 117.51 11.2101 102.71 1.11006L102.69 1.07006H102.68V1.06006Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M164.3 88.1699C156.73 92.4499 149.13 96.7199 141.58 101.06C143.71 105.57 144.95 110.65 144.73 115.65C148.57 118.21 152.41 120.77 156.25 123.35C159.55 119.01 164.71 116.75 170.94 117.45C183.33 118.8 196.07 131.45 199.85 146.25C203.8 161.68 196.72 174.16 183.59 173.56C166.38 172.78 151.83 152.05 152.36 135.51C148.41 132.91 144.44 130.28 140.51 127.67C137.84 131.01 134.02 133.31 129.4 134.07C131.66 147.44 133.78 160.85 135.98 174.24C154.62 186.4 173.22 198.62 191.91 210.73C203.83 199.88 215.65 188.92 227.55 178.04C222.1 158.64 216.65 139.23 211.18 119.83C195.55 109.32 179.93 98.7299 164.32 88.1799H164.3V88.1699Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M104.11 124.3C100.55 126.36 96.95 128.42 93.28 130.49C99.7 148.77 89.81 169.45 68.54 168.54C50.98 167.82 35.7 151.8 34.99 133.6C34.32 116.26 47.38 104.19 63.58 105.9C71.41 106.73 78.69 110.59 84.26 116.23C87.95 114.25 91.57 112.3 95.16 110.41C93.45 105.61 92.68 100.25 93.71 95.2199C82.82 88.0299 71.9 80.8699 61 73.6899C42.66 81.5299 24.32 89.4099 6 97.2999V169.12C27.9 183.01 49.82 196.94 71.77 210.73C89.31 198.45 106.76 186.07 124.29 173.77C122.27 160.23 120.21 146.7 118.26 133.14C113.09 131.53 108.19 128.39 104.11 124.29V124.3Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M97.4101 90.3601C85.8401 82.8501 74.3801 75.1701 62.8801 67.5501C61.2701 49.6401 59.6301 31.7201 58.0001 13.8101L55.1801 17.4101C56.8101 35.3201 58.4401 53.2401 60.0601 71.1501C71.5601 78.7701 83.0201 86.4501 94.59 93.9601C98.91 89.0101 101.06 88.0801 107.63 87.1201L110.45 83.5201C104.16 84.4501 101.83 85.3201 97.4101 90.3601Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M105.11 28.37C97.6 26.87 91.09 29.24 88.33 34.71C91.67 31.85 96.71 30.83 102.29 31.95C113.56 34.19 124.76 44.71 126.99 56.09C127.73 59.89 127.34 63.47 125.9 66.36C129.55 63.23 130.91 58.13 129.81 52.51C127.6 41.12 116.4 30.63 105.11 28.37Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M119.17 85.1099C118.32 79.9499 117.45 74.7999 116.56 69.6599L113.74 73.2599C114.63 78.4199 115.5 83.5499 116.35 88.7099C122.52 91.1899 125.96 93.8499 130.52 98.6699C139.14 94.0699 147.75 89.4399 156.35 84.7999L159.17 81.1999C150.57 85.8399 141.96 90.4699 133.34 95.0699C128.78 90.2499 125.33 87.5799 119.17 85.1099Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2.82 171.64V97.1899L0 100.79V175.24C22.66 189.61 45.3 203.98 68.02 218.28C86.32 205.47 104.53 192.54 122.82 179.71L125.64 176.11C108.38 188.24 88.13 202.57 70.84 214.68C48.12 200.4 25.48 186.01 2.82 171.64Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M81.7301 119.1C76.5601 113.87 69.7301 110.18 62.3701 109.4C52.6301 108.38 44.5701 112.63 40.0601 119.73C44.7501 114.83 51.5901 112.15 59.5501 113C66.9301 113.78 73.7401 117.45 78.9101 122.7L80.0601 123.87C84.7101 121.37 89.3701 118.86 94.0601 116.4L96.8801 112.8C93.3601 114.67 86.4001 118.38 82.8801 120.27L81.7301 119.1Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M89.61 130.84L86.79 134.44C89.96 143.47 90.55 152.71 85.21 161.12C91.85 154.24 93.89 143.04 90.2 132.56L89.59 130.84H89.61Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M132.96 176.87C130.75 163.43 128.12 147.05 125.86 133.61L123.04 137.21C125.47 151.62 127.77 166.05 130.14 180.47C149.52 193.14 168.86 205.82 188.27 218.41C200.94 206.88 213.51 195.23 226.14 183.68L228.96 180.08C217.35 190.72 202.74 204.21 191.09 214.81C171.68 202.22 152.32 189.54 132.96 176.87Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M137.75 101.53L134.93 105.13C137.79 111.18 138.97 115.03 138.68 121.74C143.43 124.91 148.19 128.08 152.92 131.27L155.74 127.67C150.99 124.48 146.25 121.31 141.5 118.14C141.8 111.48 140.54 107.42 137.75 101.53Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M184.46 128.19C177.14 121.68 164.17 116.56 156.98 126.02L155.74 127.65L154.92 128.69C162.24 120.51 174.56 125.5 181.64 131.79C186.37 135.98 190.17 141.47 192.49 147.33C195.22 154.28 195.85 163.52 192.53 169.69C198.83 164.15 198.65 152.24 195.31 143.75C193.01 137.87 189.19 132.4 184.46 128.21V128.19Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M106.56 24.8901C93.78 22.3301 84.38 29.9701 85.96 42.4301C87.31 53.1901 96.31 63.7201 107.17 68.1901L108.13 67.9901L106.98 67.5301C97.41 63.6001 88.42 54.0101 87.1 43.5301C85.65 32.0301 94.35 26.2501 105.12 28.4001C116.39 30.6401 127.59 41.1601 129.82 52.5401C131.45 60.9401 127.63 68.2101 118.81 69.4001L116.57 69.7001L120.11 70.2201C129.57 68.9601 134.98 61.1301 132.98 50.7901C130.64 38.7701 118.96 27.3901 106.57 24.9201L106.55 24.9001H106.56V24.8901Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M170.94 117.45C164.71 116.76 159.55 119.03 156.25 123.35L155.73 127.65L156.97 126.02C164.16 116.56 177.11 121.68 184.45 128.19C189.18 132.38 192.98 137.87 195.3 143.73C199.88 155.38 198.55 173.44 182.67 172.71C166.54 171.99 153.02 152.09 153.52 136.9L153.56 135.68L152.35 135.49C151.81 152.03 166.37 172.78 183.58 173.54C196.73 174.13 203.79 161.65 199.84 146.23C196.06 131.43 183.32 118.79 170.93 117.43V117.45H170.94Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M89.6101 130.84L90.2201 132.56C96.2101 149.6 87.09 168.53 67.63 167.72C50.76 167.02 36.81 151.44 36.18 134.88C35.59 119.54 46.88 107.79 62.36 109.42C69.74 110.2 76.5501 113.87 81.7201 119.12L82.8701 120.29L84.28 116.25C78.7 110.61 71.41 106.76 63.6 105.92C47.39 104.21 34.34 116.29 35.01 133.62C35.71 151.83 50.99 167.85 68.56 168.56C89.81 169.47 99.7101 148.79 93.3001 130.51L89.63 130.86L89.6101 130.84Z" fill="white"/>
</g>
<defs>
<clipPath id="clip0_173_2">
<rect width="228.97" height="218.41" fill="white"/>
</clipPath>
</defs>
</svg>
"; @@ -23,6 +27,7 @@ private const string PartnerSvgBase64 #region Fields: Private private IComposableApplicationManager _sut; + private readonly string workspacesFolderPath = Path.Combine("T:\\", "workspaces"); #endregion @@ -39,23 +44,118 @@ public override void Setup(){ [Test] public void SetIcon_ShouldSetCorrectFileNameAndIcon(){ - // Arrange - string workspacesFolderPath = Path.Combine("T:\\", "workspaces"); - const string expectedFilePath = @"T:\workspaces\ApolloAppWorkspace\packages\MrktApolloApp\Files\app-descriptor.json"; - const string iconPath = @"T:\SVG_Icons\Partner.svg"; + const string expectedFilePath + = @"T:\workspaces\ApolloAppWorkspace\packages\MrktApolloApp\Files\app-descriptor.json"; const string appName = "MrktApolloApp"; // Act - _sut.SetIcon(workspacesFolderPath, iconPath, appName); + _sut.SetIcon(workspacesFolderPath, IconPath, appName); // Assert FileSystem.FileExists(expectedFilePath); string appDescriptorContent = FileSystem.File.ReadAllText(expectedFilePath); AppDescriptorJson appDescriptor = JsonConvert.DeserializeObject(appDescriptorContent); - appDescriptor.IconName.Should().Be("Partner.svg"); + string iconFileName = Path.GetFileName(IconPath); + string timestampPattern = @"\d{14}$"; // Matches the datetime format "yyyyMMddHHmmss" + appDescriptor.IconName.Should().MatchRegex($"{iconFileName}_{timestampPattern}"); appDescriptor.Icon.Should().Be(PartnerSvgBase64); } + [Test] + public void SetIcon_ShouldThrow_When_AppNotFound(){ + // Arrange + const string appName = "NonExistingApp"; + + // Act + Action act = () => _sut.SetIcon(workspacesFolderPath, IconPath, appName); + + // Assert + act.Should().Throw() + .WithMessage($"App {appName} not found."); + } + + [Test] + public void SetIcon_ShouldThrow_When_MultipleAppDescriptorFoundWithAppCode(){ + // Arrange + const string appName = "MyAppCode"; + + // Act + Action act = () => _sut.SetIcon(workspacesFolderPath, IconPath, appName); + + // Assert + act.Should().Throw() + .WithMessage("More than one app-descriptor.json file found with the same Code:\n" + + "T:\\workspaces\\MyAppV1\\packages\\MrktApolloApp\\Files\\app-descriptor.json\n" + + "T:\\workspaces\\MyAppV2\\packages\\MrktApolloApp\\Files\\app-descriptor.json\n"); + } + + [Test] + public void SetIcon_ShouldThrow_When_IconPathNonExistant(){ + // Arrange + const string appName = "MyAppCode"; + + // Act + Action act = () => _sut.SetIcon(workspacesFolderPath, "C:\\1.svg", appName); + + // Assert + act.Should().Throw() + .WithMessage($"Validation failed: {Environment.NewLine} -- IconPath: Icon file 'C:\\1.svg' must exist. Severity: Error"); + } + + [Test] + public void SetIcon_ShouldThrow_When_IconPathIsEmpty(){ + // Arrange + const string appName = "MyAppCode"; + + // Act + Action act = () => _sut.SetIcon(workspacesFolderPath, string.Empty, appName); + + // Assert + act.Should().Throw() + .WithMessage($"Validation failed: {Environment.NewLine} -- IconPath: Icon path is required. Severity: Error"); + } + + [Test] + public void SetIcon_ShouldThrow_When_PackagesFolderPathNonExistant(){ + // Arrange + const string appName = "MyAppCode"; + + // Act + Action act = () => _sut.SetIcon("C:\\NonRealDir", IconPath, appName); + + // Assert + act.Should().Throw() + .WithMessage($"Validation failed: {Environment.NewLine} -- PackagesFolderPath: Packages folder path 'C:\\NonRealDir' must exist. Severity: Error"); + } + + [Test] + public void SetIcon_ShouldThrow_When_PackagesFolderPathIsEmpty(){ + // Arrange + const string appName = "MyAppCode"; + + // Act + Action act = () => _sut.SetIcon(string.Empty, IconPath, appName); + + // Assert + act.Should().Throw() + .WithMessage($"Validation failed: {Environment.NewLine} -- PackagesFolderPath: Packages folder path is required. Severity: Error"); + } + + + [Test] + public void SetIcon_ShouldThrow_When_AppDescriptorDoesNotExist(){ + // Arrange + const string appName = "iframe-sample"; + + string packagesFolderPath = Path.Combine(workspacesFolderPath, "iframe-sample"); + // Act + Action act = () => _sut.SetIcon(packagesFolderPath, IconPath, appName); + + // Assert + act.Should().Throw() + .WithMessage($"No app-descriptor.json file found in the specified packages folder path. {packagesFolderPath}"); + } + } \ No newline at end of file diff --git a/clio.tests/Examples/workspaces/MyAppV1/packages/MrktApolloApp/Assemblies/placeholder.txt b/clio.tests/Examples/workspaces/MyAppV1/packages/MrktApolloApp/Assemblies/placeholder.txt new file mode 100644 index 00000000..e69de29b diff --git a/clio.tests/Examples/workspaces/MyAppV1/packages/MrktApolloApp/Data/placeholder.txt b/clio.tests/Examples/workspaces/MyAppV1/packages/MrktApolloApp/Data/placeholder.txt new file mode 100644 index 00000000..e69de29b diff --git a/clio.tests/Examples/workspaces/MyAppV1/packages/MrktApolloApp/Files/app-descriptor.json b/clio.tests/Examples/workspaces/MyAppV1/packages/MrktApolloApp/Files/app-descriptor.json new file mode 100644 index 00000000..7b95c044 --- /dev/null +++ b/clio.tests/Examples/workspaces/MyAppV1/packages/MrktApolloApp/Files/app-descriptor.json @@ -0,0 +1,24 @@ +{ + "Name": "Apollo.io connector for Creatio", + "Description": "Apollo connector allows you to enrich contact and account records.", + "Maintainer": "Creatio", + "Icon": "", + "IconName": "", + "Color": "#FFAC07", + "Version": "1.1.4", + "MarketplaceLink": "", + "HelpLink": "", + "OrderLink": "", + "SupportEmail": "", + "Code": "MyAppCode", + "Packages": [ + { + "UId": "d40c3488-7718-4ddc-9173-949868871326", + "Name": "MrktApolloApp" + }, + { + "UId": "a2a415ef-1679-4f0e-85a3-92c34ac5fdbe", + "Name": "MrktApolloInC360" + } + ] +} \ No newline at end of file diff --git a/clio.tests/Examples/workspaces/MyAppV1/packages/MrktApolloApp/Resources/placeholder.txt b/clio.tests/Examples/workspaces/MyAppV1/packages/MrktApolloApp/Resources/placeholder.txt new file mode 100644 index 00000000..e69de29b diff --git a/clio.tests/Examples/workspaces/MyAppV1/packages/MrktApolloApp/SqlScripts/placeholder.txt b/clio.tests/Examples/workspaces/MyAppV1/packages/MrktApolloApp/SqlScripts/placeholder.txt new file mode 100644 index 00000000..e69de29b diff --git a/clio.tests/Examples/workspaces/MyAppV1/packages/MrktApolloApp/descriptor.json b/clio.tests/Examples/workspaces/MyAppV1/packages/MrktApolloApp/descriptor.json new file mode 100644 index 00000000..93b20f5e --- /dev/null +++ b/clio.tests/Examples/workspaces/MyAppV1/packages/MrktApolloApp/descriptor.json @@ -0,0 +1,23 @@ +{ + "Descriptor": { + "UId": "d40c3488-7718-4ddc-9173-949868871326", + "PackageVersion": "1.0.0", + "Name": "MrktApolloApp", + "Type": 1, + "ModifiedOnUtc": "\/Date(1701358154000)\/", + "Maintainer": "Creatio", + "ProjectPath": "Files/MrktApolloApp.csproj", + "DependsOn": [ + { + "UId": "06d9ef10-51d8-122c-8933-9212e84236c9", + "PackageVersion": "7.8.0", + "Name": "CrtBase" + }, + { + "UId": "a17d52e6-97ab-6f7f-17aa-f0e197e488ea", + "PackageVersion": "7.8.0", + "Name": "CrtUIv2" + } + ] + } +} \ No newline at end of file diff --git a/clio.tests/Examples/workspaces/MyAppV1/packages/MrktApolloInC360/Assemblies/placeholder.txt b/clio.tests/Examples/workspaces/MyAppV1/packages/MrktApolloInC360/Assemblies/placeholder.txt new file mode 100644 index 00000000..e69de29b diff --git a/clio.tests/Examples/workspaces/MyAppV1/packages/MrktApolloInC360/Data/placeholder.txt b/clio.tests/Examples/workspaces/MyAppV1/packages/MrktApolloInC360/Data/placeholder.txt new file mode 100644 index 00000000..e69de29b diff --git a/clio.tests/Examples/workspaces/MyAppV1/packages/MrktApolloInC360/SqlScripts/placeholder.txt b/clio.tests/Examples/workspaces/MyAppV1/packages/MrktApolloInC360/SqlScripts/placeholder.txt new file mode 100644 index 00000000..e69de29b diff --git a/clio.tests/Examples/workspaces/MyAppV1/packages/MrktApolloInC360/descriptor.json b/clio.tests/Examples/workspaces/MyAppV1/packages/MrktApolloInC360/descriptor.json new file mode 100644 index 00000000..99338351 --- /dev/null +++ b/clio.tests/Examples/workspaces/MyAppV1/packages/MrktApolloInC360/descriptor.json @@ -0,0 +1,26 @@ +{ + "Descriptor": { + "UId": "a2a415ef-1679-4f0e-85a3-92c34ac5fdbe", + "PackageVersion": "1.0.0", + "Name": "MrktApolloInC360", + "Type": 1, + "InstallBehavior": 1, + "ModifiedOnUtc": "\/Date(1701358165000)\/", + "Maintainer": "Creatio", + "ProjectPath": "Files/MrktApolloInC360.csproj", + "DependsOn": [ + { + "UId": "2ecba2bd-b810-47a5-a1b1-08c888529d6c", + "PackageVersion": "7.8.0", + "Name": "CrtCustomer360App", + "Type": 1 + }, + { + "UId": "d40c3488-7718-4ddc-9173-949868871326", + "PackageVersion": "1.0.0", + "Name": "MrktApolloApp", + "Type": 1 + } + ] + } +} \ No newline at end of file diff --git a/clio.tests/Examples/workspaces/MyAppV2/packages/MrktApolloApp/Assemblies/placeholder.txt b/clio.tests/Examples/workspaces/MyAppV2/packages/MrktApolloApp/Assemblies/placeholder.txt new file mode 100644 index 00000000..e69de29b diff --git a/clio.tests/Examples/workspaces/MyAppV2/packages/MrktApolloApp/Data/placeholder.txt b/clio.tests/Examples/workspaces/MyAppV2/packages/MrktApolloApp/Data/placeholder.txt new file mode 100644 index 00000000..e69de29b diff --git a/clio.tests/Examples/workspaces/MyAppV2/packages/MrktApolloApp/Files/app-descriptor.json b/clio.tests/Examples/workspaces/MyAppV2/packages/MrktApolloApp/Files/app-descriptor.json new file mode 100644 index 00000000..7b95c044 --- /dev/null +++ b/clio.tests/Examples/workspaces/MyAppV2/packages/MrktApolloApp/Files/app-descriptor.json @@ -0,0 +1,24 @@ +{ + "Name": "Apollo.io connector for Creatio", + "Description": "Apollo connector allows you to enrich contact and account records.", + "Maintainer": "Creatio", + "Icon": "", + "IconName": "", + "Color": "#FFAC07", + "Version": "1.1.4", + "MarketplaceLink": "", + "HelpLink": "", + "OrderLink": "", + "SupportEmail": "", + "Code": "MyAppCode", + "Packages": [ + { + "UId": "d40c3488-7718-4ddc-9173-949868871326", + "Name": "MrktApolloApp" + }, + { + "UId": "a2a415ef-1679-4f0e-85a3-92c34ac5fdbe", + "Name": "MrktApolloInC360" + } + ] +} \ No newline at end of file diff --git a/clio.tests/Examples/workspaces/MyAppV2/packages/MrktApolloApp/Resources/placeholder.txt b/clio.tests/Examples/workspaces/MyAppV2/packages/MrktApolloApp/Resources/placeholder.txt new file mode 100644 index 00000000..e69de29b diff --git a/clio.tests/Examples/workspaces/MyAppV2/packages/MrktApolloApp/SqlScripts/placeholder.txt b/clio.tests/Examples/workspaces/MyAppV2/packages/MrktApolloApp/SqlScripts/placeholder.txt new file mode 100644 index 00000000..e69de29b diff --git a/clio.tests/Examples/workspaces/MyAppV2/packages/MrktApolloApp/descriptor.json b/clio.tests/Examples/workspaces/MyAppV2/packages/MrktApolloApp/descriptor.json new file mode 100644 index 00000000..93b20f5e --- /dev/null +++ b/clio.tests/Examples/workspaces/MyAppV2/packages/MrktApolloApp/descriptor.json @@ -0,0 +1,23 @@ +{ + "Descriptor": { + "UId": "d40c3488-7718-4ddc-9173-949868871326", + "PackageVersion": "1.0.0", + "Name": "MrktApolloApp", + "Type": 1, + "ModifiedOnUtc": "\/Date(1701358154000)\/", + "Maintainer": "Creatio", + "ProjectPath": "Files/MrktApolloApp.csproj", + "DependsOn": [ + { + "UId": "06d9ef10-51d8-122c-8933-9212e84236c9", + "PackageVersion": "7.8.0", + "Name": "CrtBase" + }, + { + "UId": "a17d52e6-97ab-6f7f-17aa-f0e197e488ea", + "PackageVersion": "7.8.0", + "Name": "CrtUIv2" + } + ] + } +} \ No newline at end of file diff --git a/clio.tests/Examples/workspaces/MyAppV2/packages/MrktApolloInC360/Assemblies/placeholder.txt b/clio.tests/Examples/workspaces/MyAppV2/packages/MrktApolloInC360/Assemblies/placeholder.txt new file mode 100644 index 00000000..e69de29b diff --git a/clio.tests/Examples/workspaces/MyAppV2/packages/MrktApolloInC360/Data/placeholder.txt b/clio.tests/Examples/workspaces/MyAppV2/packages/MrktApolloInC360/Data/placeholder.txt new file mode 100644 index 00000000..e69de29b diff --git a/clio.tests/Examples/workspaces/MyAppV2/packages/MrktApolloInC360/SqlScripts/placeholder.txt b/clio.tests/Examples/workspaces/MyAppV2/packages/MrktApolloInC360/SqlScripts/placeholder.txt new file mode 100644 index 00000000..e69de29b diff --git a/clio.tests/Examples/workspaces/MyAppV2/packages/MrktApolloInC360/descriptor.json b/clio.tests/Examples/workspaces/MyAppV2/packages/MrktApolloInC360/descriptor.json new file mode 100644 index 00000000..99338351 --- /dev/null +++ b/clio.tests/Examples/workspaces/MyAppV2/packages/MrktApolloInC360/descriptor.json @@ -0,0 +1,26 @@ +{ + "Descriptor": { + "UId": "a2a415ef-1679-4f0e-85a3-92c34ac5fdbe", + "PackageVersion": "1.0.0", + "Name": "MrktApolloInC360", + "Type": 1, + "InstallBehavior": 1, + "ModifiedOnUtc": "\/Date(1701358165000)\/", + "Maintainer": "Creatio", + "ProjectPath": "Files/MrktApolloInC360.csproj", + "DependsOn": [ + { + "UId": "2ecba2bd-b810-47a5-a1b1-08c888529d6c", + "PackageVersion": "7.8.0", + "Name": "CrtCustomer360App", + "Type": 1 + }, + { + "UId": "d40c3488-7718-4ddc-9173-949868871326", + "PackageVersion": "1.0.0", + "Name": "MrktApolloApp", + "Type": 1 + } + ] + } +} \ No newline at end of file diff --git a/clio.tests/clio.tests.csproj b/clio.tests/clio.tests.csproj index 716b2e96..94f8664f 100644 --- a/clio.tests/clio.tests.csproj +++ b/clio.tests/clio.tests.csproj @@ -32,6 +32,63 @@ + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + @@ -228,6 +285,12 @@ + + + + + + diff --git a/clio/BindingsModule.cs b/clio/BindingsModule.cs index e16a02c9..754eec8a 100644 --- a/clio/BindingsModule.cs +++ b/clio/BindingsModule.cs @@ -22,6 +22,7 @@ using System; using System.Reflection; using Clio.Command.CreatioInstallCommand; +using Clio.ComposableApplication; using YamlDotNet.Serialization; using YamlDotNet.Serialization.NamingConventions; using FileSystem = System.IO.Abstractions.FileSystem; @@ -141,6 +142,7 @@ public IContainer Register(EnvironmentSettings settings = null, bool registerNul containerBuilder.RegisterType(); containerBuilder.RegisterType(); containerBuilder.RegisterType(); + containerBuilder.RegisterType(); containerBuilder.RegisterType(); containerBuilder.RegisterType(); containerBuilder.RegisterType(); diff --git a/clio/Command/ApplicationCommand/SetApplicationIconCommand.cs b/clio/Command/ApplicationCommand/SetApplicationIconCommand.cs index eb705766..94a01e87 100644 --- a/clio/Command/ApplicationCommand/SetApplicationIconCommand.cs +++ b/clio/Command/ApplicationCommand/SetApplicationIconCommand.cs @@ -19,9 +19,7 @@ internal class SetApplicationIconOption [Option('f', "package-folder", Required = false, HelpText = "Package folder path")] public string PackageFolderPath { get; internal set; } - - [Value(0, MetaName = "workspace", Required = false, HelpText = "Workspace folder path")] - public string WorspaceFolderPath { get; internal set; } + #endregion @@ -47,9 +45,7 @@ public SetApplicationIconCommand(IComposableApplicationManager composableApplica #region Methods: Public public override int Execute(SetApplicationIconOption options){ - string packagesFolderPath = options.PackageFolderPath.IsNotNullOrEmpty() ? - options.PackageFolderPath : Path.Combine(options.WorspaceFolderPath, "packages"); - _composableApplicationManager.SetIcon(packagesFolderPath, options.IconPath, options.AppName); + _composableApplicationManager.SetIcon(options.PackageFolderPath, options.IconPath, options.AppName); return 0; } diff --git a/clio/ComposableApplication/ComposableApplicationManager.cs b/clio/ComposableApplication/ComposableApplicationManager.cs index c737a6c9..3c14d135 100644 --- a/clio/ComposableApplication/ComposableApplicationManager.cs +++ b/clio/ComposableApplication/ComposableApplicationManager.cs @@ -2,49 +2,128 @@ using System.IO; using System.IO.Abstractions; using System.Json; +using System.Linq; using System.Text; using Clio.Package; +using FluentValidation; +using FluentValidation.Results; using Newtonsoft.Json; namespace Clio.ComposableApplication; +public class SetIconParameters +{ + + #region Properties: Public + + public string AppName { get; set; } + + public string IconPath { get; set; } + + public string PackagesFolderPath { get; set; } + + #endregion + +} + +public class SetIconParametersValidator : AbstractValidator +{ + + #region Constructors: Public + + public SetIconParametersValidator(IFileSystem fileSystem){ + RuleFor(x => x.PackagesFolderPath) + .Cascade(CascadeMode.Stop) + .NotEmpty().WithMessage("Packages folder path is required.") + .Must(fileSystem.Directory.Exists) + .WithMessage(x => $"Packages folder path '{x.PackagesFolderPath}' must exist."); + + RuleFor(x => x.IconPath) + .Cascade(CascadeMode.Stop) + .NotEmpty() + .WithMessage("Icon path is required.") + .Must(fileSystem.File.Exists) + .WithMessage(x => $"Icon file '{x.IconPath}' must exist."); + + RuleFor(x => x.AppName) + .Cascade(CascadeMode.Stop) + .NotEmpty() + .WithMessage("App name is required."); + } + + #endregion + +} + public class ComposableApplicationManager : IComposableApplicationManager { #region Fields: Private private readonly IFileSystem _fileSystem; + private readonly IValidator _validator; #endregion #region Constructors: Public - public ComposableApplicationManager(IFileSystem fileSystem1){ - _fileSystem = fileSystem1; + public ComposableApplicationManager(IFileSystem fileSystem, IValidator validator){ + _fileSystem = fileSystem; + _validator = validator; } #endregion #region Methods: Public - public void SetIcon(string packagesFolderPath, string iconPath, string appName){ + SetIconParameters parameters = new() { + PackagesFolderPath = packagesFolderPath, + IconPath = iconPath, + AppName = appName + }; + + ValidationResult validationResult = _validator.Validate(parameters); + if (!validationResult.IsValid) { + throw new ValidationException(validationResult.Errors); + } + string[] files = _fileSystem.Directory .GetFiles(packagesFolderPath, "app-descriptor.json", SearchOption.AllDirectories); - foreach (string file in files) { - string appDescriptorContent = _fileSystem.File.ReadAllText(file); - AppDescriptorJson appDescriptor = JsonConvert.DeserializeObject(appDescriptorContent); - if (appDescriptor.Name == appName || appDescriptor.Code == appName) { - string iconFileName = Path.GetFileName(iconPath); - appDescriptor.IconName = iconFileName; - - string base64EncodedIcon = Convert.ToBase64String(_fileSystem.File.ReadAllBytes(iconPath)); - appDescriptor.Icon = base64EncodedIcon; - string formattedJsonString = JsonConvert.SerializeObject(appDescriptor, Formatting.Indented); - _fileSystem.File.WriteAllText(file, formattedJsonString); + if (files.Length == 0) { + throw new FileNotFoundException($"No app-descriptor.json file found in the specified packages folder path. {packagesFolderPath}"); + } + + var matchingFiles = files + .Select(file => new {File = file, Content = _fileSystem.File.ReadAllText(file)}) + .Select(fileContent => new { + fileContent.File, AppDescriptor = JsonConvert.DeserializeObject(fileContent.Content) + }) + .Where(fileDescriptor => fileDescriptor.AppDescriptor.Code == appName) + .ToList(); + + if (matchingFiles.Count > 1) { + StringBuilder exceptionMessage = new("More than one app-descriptor.json file found with the same Code:\n"); + foreach (var file in matchingFiles) { + exceptionMessage.AppendLine(file.File); } + throw new InvalidOperationException(exceptionMessage.ToString()); } + + if (matchingFiles.Count == 0) { + throw new ValidationException($"App {appName} not found."); + } + + var matchingFile = matchingFiles[0]; + string iconFileName = Path.GetFileName(iconPath); + string timestamp = DateTime.Now.ToString("yyyyMMddHHmmss"); + matchingFile.AppDescriptor.IconName = $"{iconFileName}_{timestamp}"; + + string base64EncodedIcon = Convert.ToBase64String(_fileSystem.File.ReadAllBytes(iconPath)); + matchingFile.AppDescriptor.Icon = base64EncodedIcon; + string formattedJsonString = JsonConvert.SerializeObject(matchingFile.AppDescriptor, Formatting.Indented); + _fileSystem.File.WriteAllText(matchingFile.File, formattedJsonString); } public void SetVersion(string appPackagesFolderPath, string version, string packageName = null){ @@ -101,7 +180,7 @@ public interface IComposableApplicationManager #region Methods: Public /// - /// Sets the icon for the specified application by updating the app-descriptor.json file. + /// Sets the icon for the specified application by updating the app-descriptor.json file. /// /// The path to the folder containing the application packages. /// The path to the icon file to be set. diff --git a/clio/Wiki/WikiAnchors.txt b/clio/Wiki/WikiAnchors.txt index 74d8c694..ed73ac07 100644 --- a/clio/Wiki/WikiAnchors.txt +++ b/clio/Wiki/WikiAnchors.txt @@ -17,4 +17,5 @@ pkg-hotfix:enable/disable-pkg-hotfix-mode save-state:create-manifest-from-creatio-instance show-diff:show-difference-in-settings-for-two-creatio-intances mock-dat:mock-data-for-unit-tests -deploy-creatio:run-creatio-installation \ No newline at end of file +deploy-creatio:run-creatio-installation +set-app-icon:set-application-icon \ No newline at end of file