From 09f20b78317e8f98b4e6ab821a592af812704a76 Mon Sep 17 00:00:00 2001 From: m c <458905+goatrocks@users.noreply.github.com> Date: Wed, 18 May 2022 22:40:44 -0400 Subject: [PATCH] update all activities to use newer version of uipath shared library --- .../DesignerMetadata.cs | 28 ++--- .../Designers/DocumentExtractionDesigner.xaml | 4 +- .../Designers/ExtractValuesDesigner.xaml | 4 +- .../Designers/IndicoIPADesigner.xaml | 6 +- .../Designers/IndicoScopeDesigner.xaml | 6 +- .../Designers/ListDatasetsDesigner.xaml | 4 +- .../Designers/ListSubmissionsDesigner.xaml | 4 +- .../Designers/ListWithTimeoutDesigner.xaml | 4 +- .../Designers/ListWorkflowsDesigner.xaml | 4 +- .../Designers/SubmissionResultDesigner.xaml | 4 +- .../Designers/SubmitReviewDesigner.xaml | 4 +- .../Designers/WorkflowSubmissionDesigner.xaml | 4 +- .../Properties/SharedResources.cs | 2 +- .../Activities/Common/IndicoActivityBase.cs | 49 ++++---- .../Activities/DocumentExtraction.cs | 69 ++++++----- .../Activities/GenerateSubmissionResult.cs | 63 +++++----- .../Activities/IndicoScope.cs | 5 +- .../Activities/ListDatasets.cs | 56 ++++----- .../Activities/ListSubmissions.cs | 54 ++------- .../Activities/ListWithTimeout.cs | 4 +- .../Activities/ListWorkflows.cs | 61 +++++----- .../Activities/SubmissionResult.cs | 71 ++++++----- .../Activities/SubmitReview.cs | 100 ++++++++-------- .../Activities/WorkflowSubmission.cs | 112 +++++++++--------- .../Properties/SharedResources.cs | 2 +- .../Activities/DocumentExtractionTests.cs | 10 +- .../Helpers/TaskActivityExtensions.cs | 26 ++-- .../Properties/SharedResources.cs | 2 +- Shared/Themes/Generic.xaml | 4 +- .../Controls/ActivityDecoratorControl.cs | 2 +- .../Controls/ComboboxControl.xaml | 2 +- .../Controls/ComboboxControl.xaml.cs | 2 +- .../Controls/FilePathControl.xaml | 2 +- .../Controls/FilePathControl.xaml.cs | 2 +- .../Controls/RestrictiveBodyConnector.xaml | 2 +- .../Controls/RestrictiveBodyConnector.xaml.cs | 2 +- .../Converters/ActivityIconConverter.cs | 2 +- .../Converters/ArrayToStringConverter.cs | 2 +- .../StringArgumentToComboboxConverter.cs | 2 +- .../Editors/ArgumentCollectionEditor.cs | 6 +- .../Editors/ArgumentDictionaryEditor.cs | 2 +- .../Editors/EditorTemplates.xaml | 6 +- .../Editors/EditorTemplates.xaml.cs | 2 +- .../Editors/PasswordBoxAssistant.cs | 2 +- .../Editors/PasswordEditor.cs | 2 +- .../Services/ModelItemExtensions.cs | 2 +- .../Services/Xaml.cs | 2 +- .../ActivitiesConstraints.cs | 2 +- .../Attributes/ArgumentSettingAttribute.cs | 2 +- .../Contracts/BaseChildActivity.cs | 2 +- .../IObjectContainer.cs | 2 +- .../InArgumentExtensions.cs | 2 +- .../Indico.UiPath.Shared.Activities.shproj | 13 ++ .../Localization/Localization.cs | 4 +- .../ObjectContainer.cs | 2 +- .../Runtime/AsyncTaskCodeActivity.cs | 2 +- .../Runtime/AsyncTaskNativeActivity.cs | 2 +- .../Runtime/AsyncTaskNativeImplementation.cs | 4 +- .../Runtime/BookmarkResumptionHelper.cs | 2 +- .../Runtime/ContinuableAsyncCodeActivity.cs | 6 +- .../Runtime/ContinuableAsyncNativeActivity.cs | 10 +- .../Utilities/ActivityExtensions.cs | 2 +- .../Utilities/ChildActivityExtensions.cs | 2 +- .../Utilities/EnumNameConverter.cs | 2 +- .../Utilities/HashFunctions.cs | 2 +- 65 files changed, 418 insertions(+), 455 deletions(-) create mode 100644 Shared/UiPath.Shared.Activities/Indico.UiPath.Shared.Activities.shproj diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/DesignerMetadata.cs b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/DesignerMetadata.cs index c09b9b2..f7b14f4 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/DesignerMetadata.cs +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/DesignerMetadata.cs @@ -16,30 +16,26 @@ public void Register() builder.AddCustomAttributes(typeof(IndicoScope), new DesignerAttribute(typeof(IndicoScopeDesigner))); builder.AddCustomAttributes(typeof(IndicoScope), new HelpKeywordAttribute("")); - //builder.AddCustomAttributes(typeof(ListDatasets), new DesignerAttribute(typeof(ListDatasetsDesigner))); - //builder.AddCustomAttributes(typeof(ListDatasets), new HelpKeywordAttribute("")); + builder.AddCustomAttributes(typeof(ListDatasets), new DesignerAttribute(typeof(ListDatasetsDesigner))); + builder.AddCustomAttributes(typeof(ListDatasets), new HelpKeywordAttribute("")); - //builder.AddCustomAttributes(typeof(DocumentExtraction), new DesignerAttribute(typeof(DocumentExtractionDesigner))); - //builder.AddCustomAttributes(typeof(DocumentExtraction), new HelpKeywordAttribute("")); + builder.AddCustomAttributes(typeof(DocumentExtraction), new DesignerAttribute(typeof(DocumentExtractionDesigner))); + builder.AddCustomAttributes(typeof(DocumentExtraction), new HelpKeywordAttribute("")); - //builder.AddCustomAttributes(typeof(ListWorkflows), new DesignerAttribute(typeof(ListWorkflowsDesigner))); - //builder.AddCustomAttributes(typeof(ListWorkflows), new HelpKeywordAttribute("")); + builder.AddCustomAttributes(typeof(ListWorkflows), new DesignerAttribute(typeof(ListWorkflowsDesigner))); + builder.AddCustomAttributes(typeof(ListWorkflows), new HelpKeywordAttribute("")); - //builder.AddCustomAttributes(typeof(WorkflowSubmission), new DesignerAttribute(typeof(WorkflowSubmissionDesigner))); - //builder.AddCustomAttributes(typeof(WorkflowSubmission), new HelpKeywordAttribute("")); + builder.AddCustomAttributes(typeof(WorkflowSubmission), new DesignerAttribute(typeof(WorkflowSubmissionDesigner))); + builder.AddCustomAttributes(typeof(WorkflowSubmission), new HelpKeywordAttribute("")); - //builder.AddCustomAttributes(typeof(SubmissionResult), new DesignerAttribute(typeof(SubmissionResultDesigner))); - //builder.AddCustomAttributes(typeof(SubmissionResult), new HelpKeywordAttribute("")); + builder.AddCustomAttributes(typeof(SubmissionResult), new DesignerAttribute(typeof(SubmissionResultDesigner))); + builder.AddCustomAttributes(typeof(SubmissionResult), new HelpKeywordAttribute("")); builder.AddCustomAttributes(typeof(ListSubmissions), new DesignerAttribute(typeof(ListSubmissionsDesigner))); builder.AddCustomAttributes(typeof(ListSubmissions), new HelpKeywordAttribute("")); - //builder.AddCustomAttributes(typeof(SubmitReview), new DesignerAttribute(typeof(SubmitReviewDesigner))); - //builder.AddCustomAttributes(typeof(SubmitReview), new HelpKeywordAttribute("")); - //builder.AddCustomAttributes(typeof(ListWithTimeout), categoryAttribute); - //builder.AddCustomAttributes(typeof(ListWithTimeout), new DesignerAttribute(typeof(ListWithTimeoutDesigner))); - //builder.AddCustomAttributes(typeof(ListWithTimeout), new HelpKeywordAttribute("")); - + builder.AddCustomAttributes(typeof(SubmitReview), new DesignerAttribute(typeof(SubmitReviewDesigner))); + builder.AddCustomAttributes(typeof(SubmitReview), new HelpKeywordAttribute("")); MetadataStore.AddAttributeTable(builder.CreateTable()); } diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/DocumentExtractionDesigner.xaml b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/DocumentExtractionDesigner.xaml index 5220b12..31e142c 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/DocumentExtractionDesigner.xaml +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/DocumentExtractionDesigner.xaml @@ -5,8 +5,8 @@ xmlns:sap="clr-namespace:System.Activities.Presentation;assembly=System.Activities.Presentation" xmlns:sapv="clr-namespace:System.Activities.Presentation.View;assembly=System.Activities.Presentation" xmlns:sapc="clr-namespace:System.Activities.Presentation.Converters;assembly=System.Activities.Presentation" - xmlns:converters="clr-namespace:UiPath.Shared.Activities.Design.Converters" - xmlns:uip="clr-namespace:UiPath.Shared.Activities.Design.Controls"> + xmlns:converters="clr-namespace:Indico.UiPath.Shared.Activities.Design.Converters" + xmlns:uip="clr-namespace:Indico.UiPath.Shared.Activities.Design.Controls"> diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/ExtractValuesDesigner.xaml b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/ExtractValuesDesigner.xaml index e5cd442..0c5d851 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/ExtractValuesDesigner.xaml +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/ExtractValuesDesigner.xaml @@ -5,8 +5,8 @@ xmlns:sap="clr-namespace:System.Activities.Presentation;assembly=System.Activities.Presentation" xmlns:sapv="clr-namespace:System.Activities.Presentation.View;assembly=System.Activities.Presentation" xmlns:sapc="clr-namespace:System.Activities.Presentation.Converters;assembly=System.Activities.Presentation" - xmlns:converters="clr-namespace:UiPath.Shared.Activities.Design.Converters" - xmlns:uip="clr-namespace:UiPath.Shared.Activities.Design.Controls"> + xmlns:converters="clr-namespace:Indico.UiPath.Shared.Activities.Design.Converters" + xmlns:uip="clr-namespace:Indico.UiPath.Shared.Activities.Design.Controls"> diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/IndicoIPADesigner.xaml b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/IndicoIPADesigner.xaml index 1f691b3..1c39428 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/IndicoIPADesigner.xaml +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/IndicoIPADesigner.xaml @@ -3,10 +3,10 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sa="http://schemas.microsoft.com/netfx/2009/xaml/activities" xmlns:p="clr-namespace:Indico.RPAActivities.Activities.Design.Properties" - xmlns:sharedres="clr-namespace:UiPath.Shared.Localization" + xmlns:sharedres="clr-namespace:Indico.UiPath.Shared.Localization" xmlns:sap="clr-namespace:System.Activities.Presentation;assembly=System.Activities.Presentation" - xmlns:converters="clr-namespace:UiPath.Shared.Activities.Design.Converters" - xmlns:uip="clr-namespace:UiPath.Shared.Activities.Design.Controls"> + xmlns:converters="clr-namespace:Indico.UiPath.Shared.Activities.Design.Converters" + xmlns:uip="clr-namespace:Indico.UiPath.Shared.Activities.Design.Controls"> diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/IndicoScopeDesigner.xaml b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/IndicoScopeDesigner.xaml index db0695b..a060ce5 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/IndicoScopeDesigner.xaml +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/IndicoScopeDesigner.xaml @@ -3,10 +3,10 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sa="http://schemas.microsoft.com/netfx/2009/xaml/activities" xmlns:p="clr-namespace:Indico.RPAActivities.Activities.Design.Properties" - xmlns:sharedres="clr-namespace:UiPath.Shared.Localization" + xmlns:sharedres="clr-namespace:Indico.UiPath.Shared.Localization" xmlns:sap="clr-namespace:System.Activities.Presentation;assembly=System.Activities.Presentation" - xmlns:converters="clr-namespace:UiPath.Shared.Activities.Design.Converters" - xmlns:uip="clr-namespace:UiPath.Shared.Activities.Design.Controls"> + xmlns:converters="clr-namespace:Indico.UiPath.Shared.Activities.Design.Converters" + xmlns:uip="clr-namespace:Indico.UiPath.Shared.Activities.Design.Controls"> diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/ListDatasetsDesigner.xaml b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/ListDatasetsDesigner.xaml index 90b18f3..02a860a 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/ListDatasetsDesigner.xaml +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/ListDatasetsDesigner.xaml @@ -5,8 +5,8 @@ xmlns:sap="clr-namespace:System.Activities.Presentation;assembly=System.Activities.Presentation" xmlns:sapv="clr-namespace:System.Activities.Presentation.View;assembly=System.Activities.Presentation" xmlns:sapc="clr-namespace:System.Activities.Presentation.Converters;assembly=System.Activities.Presentation" - xmlns:converters="clr-namespace:UiPath.Shared.Activities.Design.Converters" - xmlns:uip="clr-namespace:UiPath.Shared.Activities.Design.Controls" >> + xmlns:converters="clr-namespace:Indico.UiPath.Shared.Activities.Design.Converters" + xmlns:uip="clr-namespace:Indico.UiPath.Shared.Activities.Design.Controls" >> diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/ListSubmissionsDesigner.xaml b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/ListSubmissionsDesigner.xaml index 7e3bdb0..2348e36 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/ListSubmissionsDesigner.xaml +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/ListSubmissionsDesigner.xaml @@ -5,8 +5,8 @@ xmlns:sap="clr-namespace:System.Activities.Presentation;assembly=System.Activities.Presentation" xmlns:sapv="clr-namespace:System.Activities.Presentation.View;assembly=System.Activities.Presentation" xmlns:sapc="clr-namespace:System.Activities.Presentation.Converters;assembly=System.Activities.Presentation" - xmlns:converters="clr-namespace:UiPath.Shared.Activities.Design.Converters" - xmlns:uip="clr-namespace:UiPath.Shared.Activities.Design.Controls"> + xmlns:converters="clr-namespace:Indico.UiPath.Shared.Activities.Design.Converters" + xmlns:uip="clr-namespace:Indico.UiPath.Shared.Activities.Design.Controls"> diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/ListWithTimeoutDesigner.xaml b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/ListWithTimeoutDesigner.xaml index 5901ae6..ff0b75c 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/ListWithTimeoutDesigner.xaml +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/ListWithTimeoutDesigner.xaml @@ -5,8 +5,8 @@ xmlns:sap="clr-namespace:System.Activities.Presentation;assembly=System.Activities.Presentation" xmlns:sapv="clr-namespace:System.Activities.Presentation.View;assembly=System.Activities.Presentation" xmlns:sapc="clr-namespace:System.Activities.Presentation.Converters;assembly=System.Activities.Presentation" - xmlns:converters="clr-namespace:UiPath.Shared.Activities.Design.Converters" - xmlns:uip="clr-namespace:UiPath.Shared.Activities.Design.Controls"> + xmlns:converters="clr-namespace:Indico.UiPath.Shared.Activities.Design.Converters" + xmlns:uip="clr-namespace:Indico.UiPath.Shared.Activities.Design.Controls"> diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/ListWorkflowsDesigner.xaml b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/ListWorkflowsDesigner.xaml index ff04311..7134aa6 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/ListWorkflowsDesigner.xaml +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/ListWorkflowsDesigner.xaml @@ -5,8 +5,8 @@ xmlns:sap="clr-namespace:System.Activities.Presentation;assembly=System.Activities.Presentation" xmlns:sapv="clr-namespace:System.Activities.Presentation.View;assembly=System.Activities.Presentation" xmlns:sapc="clr-namespace:System.Activities.Presentation.Converters;assembly=System.Activities.Presentation" - xmlns:converters="clr-namespace:UiPath.Shared.Activities.Design.Converters" - xmlns:uip="clr-namespace:UiPath.Shared.Activities.Design.Controls"> + xmlns:converters="clr-namespace:Indico.UiPath.Shared.Activities.Design.Converters" + xmlns:uip="clr-namespace:Indico.UiPath.Shared.Activities.Design.Controls"> diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/SubmissionResultDesigner.xaml b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/SubmissionResultDesigner.xaml index 543dd12..48c21fb 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/SubmissionResultDesigner.xaml +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/SubmissionResultDesigner.xaml @@ -5,8 +5,8 @@ xmlns:sap="clr-namespace:System.Activities.Presentation;assembly=System.Activities.Presentation" xmlns:sapv="clr-namespace:System.Activities.Presentation.View;assembly=System.Activities.Presentation" xmlns:sapc="clr-namespace:System.Activities.Presentation.Converters;assembly=System.Activities.Presentation" - xmlns:converters="clr-namespace:UiPath.Shared.Activities.Design.Converters" - xmlns:uip="clr-namespace:UiPath.Shared.Activities.Design.Controls"> + xmlns:converters="clr-namespace:Indico.UiPath.Shared.Activities.Design.Converters" + xmlns:uip="clr-namespace:Indico.UiPath.Shared.Activities.Design.Controls"> diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/SubmitReviewDesigner.xaml b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/SubmitReviewDesigner.xaml index 7cce70f..9fb40d8 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/SubmitReviewDesigner.xaml +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/SubmitReviewDesigner.xaml @@ -5,8 +5,8 @@ xmlns:sap="clr-namespace:System.Activities.Presentation;assembly=System.Activities.Presentation" xmlns:sapv="clr-namespace:System.Activities.Presentation.View;assembly=System.Activities.Presentation" xmlns:sapc="clr-namespace:System.Activities.Presentation.Converters;assembly=System.Activities.Presentation" - xmlns:converters="clr-namespace:UiPath.Shared.Activities.Design.Converters" - xmlns:uip="clr-namespace:UiPath.Shared.Activities.Design.Controls"> + xmlns:converters="clr-namespace:Indico.UiPath.Shared.Activities.Design.Converters" + xmlns:uip="clr-namespace:Indico.UiPath.Shared.Activities.Design.Controls"> diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/WorkflowSubmissionDesigner.xaml b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/WorkflowSubmissionDesigner.xaml index 1d7e226..36be3ab 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/WorkflowSubmissionDesigner.xaml +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Designers/WorkflowSubmissionDesigner.xaml @@ -5,8 +5,8 @@ xmlns:sap="clr-namespace:System.Activities.Presentation;assembly=System.Activities.Presentation" xmlns:sapv="clr-namespace:System.Activities.Presentation.View;assembly=System.Activities.Presentation" xmlns:sapc="clr-namespace:System.Activities.Presentation.Converters;assembly=System.Activities.Presentation" - xmlns:converters="clr-namespace:UiPath.Shared.Activities.Design.Converters" - xmlns:uip="clr-namespace:UiPath.Shared.Activities.Design.Controls"> + xmlns:converters="clr-namespace:Indico.UiPath.Shared.Activities.Design.Converters" + xmlns:uip="clr-namespace:Indico.UiPath.Shared.Activities.Design.Controls"> diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Properties/SharedResources.cs b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Properties/SharedResources.cs index d0c2c8f..eceda13 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Properties/SharedResources.cs +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities.Design/Properties/SharedResources.cs @@ -1,4 +1,4 @@ -namespace UiPath.Shared.Localization +namespace Indico.UiPath.Shared.Localization { class SharedResources : Indico.RPAActivities.Activities.Design.Properties.Resources { diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/Common/IndicoActivityBase.cs b/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/Common/IndicoActivityBase.cs index 9d19336..8c7e017 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/Common/IndicoActivityBase.cs +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/Common/IndicoActivityBase.cs @@ -1,64 +1,62 @@ using System; using System.Activities; -using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; using Indico.RPAActivities.Activities.Properties; -using IndicoV2.Submissions.Models; -using UiPath.Shared.Activities; -using UiPath.Shared.Activities.Localization; -using UiPath.Shared.Activities.Utilities; +using Indico.UiPath.Shared.Activities; +using Indico.UiPath.Shared.Activities.Localization; +using Indico.UiPath.Shared.Activities.Utilities; namespace Indico.RPAActivities.Activities.Activities { public abstract class IndicoActivityBase : ContinuableAsyncCodeActivity { protected Application Application { get; private set; } - + /// + /// If set, continue executing the remaining activities even if the current activity has failed. + /// + [LocalizedCategory(nameof(Resources.Common_Category))] + [LocalizedDisplayName(nameof(Resources.ContinueOnError_DisplayName))] + [LocalizedDescription(nameof(Resources.ContinueOnError_Description))] + public override InArgument ContinueOnError { get; set; } [LocalizedCategory(nameof(Resources.Common_Category))] [LocalizedDisplayName(nameof(Resources.Timeout_DisplayName))] [LocalizedDescription(nameof(Resources.Timeout_Description))] public InArgument TimeoutMS { get; set; } = 60000; - [LocalizedCategory(nameof(Resources.Common_Category))] - [LocalizedDisplayName(nameof(Resources.ContinueOnError_DisplayName))] - [LocalizedDescription(nameof(Resources.ContinueOnError_Description))] - public override InArgument ContinueOnError { get; set; } - protected IndicoActivityBase() { Constraints.Add(ActivityConstraints.HasParentType, IndicoScope>(string.Format(Resources.ValidationScope_Error, Resources.IndicoScope_DisplayName))); - } + protected abstract TInput GetInputs(AsyncCodeActivityContext ctx); + protected override IAsyncResult BeginExecute(AsyncCodeActivityContext context, AsyncCallback callback, object state) { - var objectContainer = context.GetFromContext(IndicoScope.ParentContainerPropertyTag); + IObjectContainer objectContainer = context.GetFromContext(IndicoScope.ParentContainerPropertyTag); Application = objectContainer.Get(); - return base.BeginExecute(context, callback, state); - } protected override async Task> ExecuteAsync(AsyncCodeActivityContext context, CancellationToken cancellationToken) { // Inputs - var timeout = TimeoutMS.Get(context); + int timeout = TimeoutMS.Get(context); - var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken); + CancellationTokenSource cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken); cts.CancelAfter(timeout); // Set a timeout on the execution - var task = ExecuteWithTimeout(context, cts.Token); - var timer = Task.Delay(timeout, cts.Token); - var completedTask = await Task.WhenAny(task, timer); + Task task = ExecuteWithTimeout(GetInputs(context), cts.Token); + Task timer = Task.Delay(timeout, cts.Token); + Task completedTask = await Task.WhenAny(task, timer); if (completedTask == task) { // Outputs return (ctx) => { - Results(ctx, task.Result); + SetResults(ctx, task.Result); }; } @@ -67,13 +65,8 @@ protected override async Task> ExecuteAsync(Asy throw new TimeoutException(Resources.Timeout_Error); } - } - - protected abstract void Results(AsyncCodeActivityContext context, TOutput result); - - protected abstract Task ExecuteWithTimeout(AsyncCodeActivityContext context, CancellationToken cancellationToken = default); + protected abstract void SetResults(AsyncCodeActivityContext context, TOutput result); + protected abstract Task ExecuteWithTimeout(TInput inputs, CancellationToken cancellationToken = default); } } - - diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/DocumentExtraction.cs b/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/DocumentExtraction.cs index de3592f..7a1020f 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/DocumentExtraction.cs +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/DocumentExtraction.cs @@ -1,41 +1,40 @@ -//using System.Activities; -//using System.Threading; -//using System.Threading.Tasks; -//using Indico.RPAActivities.Activities.Activities; -//using Indico.RPAActivities.Activities.Properties; -//using UiPath.Shared.Activities.Localization; -//using IndicoV2.Ocr.Models; +using System.Activities; +using System.Threading; +using System.Threading.Tasks; +using Indico.RPAActivities.Activities.Activities; +using Indico.RPAActivities.Activities.Properties; +using Indico.UiPath.Shared.Activities.Localization; +using IndicoV2.Ocr.Models; -//namespace Indico.RPAActivities.Activities -//{ -// [LocalizedCategory(nameof(Resources.OCRCategory))] -// [LocalizedDisplayName(nameof(Resources.DocumentExtraction_DisplayName))] -// [LocalizedDescription(nameof(Resources.DocumentExtraction_Description))] -// public class DocumentExtraction : IndicoActivityBase<(DocumentExtractionPreset Preset, string Document), string> -// { -// [LocalizedDisplayName(nameof(Resources.DocumentExtraction_ConfigType_DisplayName))] -// [LocalizedDescription(nameof(Resources.DocumentExtraction_ConfigType_Description))] -// [LocalizedCategory(nameof(Resources.Input_Category))] -// public InArgument Preset { get; set; } = DocumentExtractionPreset.Standard; +namespace Indico.RPAActivities.Activities +{ + [LocalizedDisplayName(nameof(Resources.DocumentExtraction_DisplayName))] + [LocalizedDescription(nameof(Resources.DocumentExtraction_Description))] + public class DocumentExtraction : IndicoActivityBase<(DocumentExtractionPreset Preset, string Document), string> + { + [LocalizedDisplayName(nameof(Resources.DocumentExtraction_ConfigType_DisplayName))] + [LocalizedDescription(nameof(Resources.DocumentExtraction_ConfigType_Description))] + [LocalizedCategory(nameof(Resources.Input_Category))] + public InArgument Preset { get; set; } = DocumentExtractionPreset.Standard; -// [LocalizedDisplayName(nameof(Resources.DocumentExtraction_Document_DisplayName))] -// [LocalizedDescription(nameof(Resources.DocumentExtraction_Document_Description))] -// [LocalizedCategory(nameof(Resources.Input_Category))] -// [RequiredArgument] -// public InArgument Document { get; set; } + [LocalizedDisplayName(nameof(Resources.DocumentExtraction_Document_DisplayName))] + [LocalizedDescription(nameof(Resources.DocumentExtraction_Document_Description))] + [LocalizedCategory(nameof(Resources.Input_Category))] + [RequiredArgument] + public InArgument Document { get; set; } -// [LocalizedDisplayName(nameof(Resources.DocumentExtraction_Results_DisplayName))] -// [LocalizedDescription(nameof(Resources.DocumentExtraction_Results_Description))] -// [LocalizedCategory(nameof(Resources.Output_Category))] -// public OutArgument Results { get; set; } - -// protected override (DocumentExtractionPreset Preset, string Document) GetInputs(AsyncCodeActivityContext ctx) => -// (Preset.Get(ctx), Document.Get(ctx)); + [LocalizedDisplayName(nameof(Resources.DocumentExtraction_Results_DisplayName))] + [LocalizedDescription(nameof(Resources.DocumentExtraction_Results_Description))] + [LocalizedCategory(nameof(Resources.Output_Category))] + public OutArgument Results { get; set; } -// protected override async Task ExecuteAsync((DocumentExtractionPreset Preset, string Document) input, CancellationToken cancellationToken) -// => await Application.ExtractDocument(input.Document, input.Preset, cancellationToken); + protected override (DocumentExtractionPreset Preset, string Document) GetInputs(AsyncCodeActivityContext ctx) => + (Preset.Get(ctx), Document.Get(ctx)); -// protected override void SetOutputs(AsyncCodeActivityContext ctx, string output) => Results.Set(ctx, output); -// } -//} + protected override async Task ExecuteWithTimeout((DocumentExtractionPreset Preset, string Document) input, CancellationToken cancellationToken) + => await Application.ExtractDocument(input.Document, input.Preset, cancellationToken); + + protected override void SetResults(AsyncCodeActivityContext ctx, string output) => Results.Set(ctx, output); + } +} diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/GenerateSubmissionResult.cs b/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/GenerateSubmissionResult.cs index ae3488b..ec3a48b 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/GenerateSubmissionResult.cs +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/GenerateSubmissionResult.cs @@ -1,38 +1,37 @@ -//using System.Activities; -//using System.Threading; -//using System.Threading.Tasks; -//using Indico.RPAActivities.Activities.Activities; -//using Newtonsoft.Json.Linq; -//using Indico.RPAActivities.Activities.Properties; -//using UiPath.Shared.Activities.Localization; -//using IndicoV2.Submissions.Models; -//using System; +using System.Activities; +using System.Threading; +using System.Threading.Tasks; +using Indico.RPAActivities.Activities.Activities; +using Newtonsoft.Json.Linq; +using Indico.RPAActivities.Activities.Properties; +using Indico.UiPath.Shared.Activities.Localization; +using IndicoV2.Submissions.Models; +using System; -//namespace Indico.RPAActivities.Activities -//{ -// [LocalizedCategory(nameof(Resources.SubmissionCategory))] -// [LocalizedDisplayName(nameof(Resources.GenerateSubmissionResult_DisplayName))] -// [LocalizedDescription(nameof(Resources.GenerateSubmissionResult_Description))] -// public class GenerateSubmissionResult : IndicoActivityBase -// { -// [LocalizedDisplayName(nameof(Resources.GenerateSubmissionResult_SubmissionID_DisplayName))] -// [LocalizedDescription(nameof(Resources.GenerateSubmissionResult_SubmissionID_Description))] -// [LocalizedCategory(nameof(Resources.Input_Category))] -// [RequiredArgument] -// public InArgument SubmissionID { get; set; } +namespace Indico.RPAActivities.Activities +{ + [LocalizedDisplayName(nameof(Resources.GenerateSubmissionResult_DisplayName))] + [LocalizedDescription(nameof(Resources.GenerateSubmissionResult_Description))] + public class GenerateSubmissionResult : IndicoActivityBase + { + [LocalizedDisplayName(nameof(Resources.GenerateSubmissionResult_SubmissionID_DisplayName))] + [LocalizedDescription(nameof(Resources.GenerateSubmissionResult_SubmissionID_Description))] + [LocalizedCategory(nameof(Resources.Input_Category))] + [RequiredArgument] + public InArgument SubmissionID { get; set; } -// [LocalizedDisplayName(nameof(Resources.GenerateSubmissionResult_Result_DisplayName))] -// [LocalizedDescription(nameof(Resources.GenerateSubmissionResult_Result_Description))] -// [LocalizedCategory(nameof(Resources.Output_Category))] -// public OutArgument Result { get; set; } + [LocalizedDisplayName(nameof(Resources.GenerateSubmissionResult_Result_DisplayName))] + [LocalizedDescription(nameof(Resources.GenerateSubmissionResult_Result_Description))] + [LocalizedCategory(nameof(Resources.Output_Category))] + public OutArgument Result { get; set; } -// protected override int GetInputs(AsyncCodeActivityContext ctx) => -// SubmissionID.Get(ctx); + protected override int GetInputs(AsyncCodeActivityContext ctx) => + SubmissionID.Get(ctx); -// protected override Task ExecuteAsync(int input, CancellationToken cancellationToken) => -// Application.GenerateSubmissionResult(input, cancellationToken); + protected override Task ExecuteWithTimeout(int input, CancellationToken cancellationToken) => + Application.GenerateSubmissionResult(input, cancellationToken); -// protected override void SetOutputs(AsyncCodeActivityContext ctx, string output) => Result.Set(ctx, output); -// } -//} + protected override void SetResults(AsyncCodeActivityContext ctx, string output) => Result.Set(ctx, output); + } +} diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/IndicoScope.cs b/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/IndicoScope.cs index 5b1a60c..0599fcc 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/IndicoScope.cs +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/IndicoScope.cs @@ -3,12 +3,11 @@ using System.Activities.Statements; using System.ComponentModel; using Indico.RPAActivities.Activities.Properties; -using UiPath.Shared.Activities; -using UiPath.Shared.Activities.Localization; +using Indico.UiPath.Shared.Activities; +using Indico.UiPath.Shared.Activities.Localization; namespace Indico.RPAActivities.Activities { - [LocalizedDisplayName(nameof(Resources.IndicoScope_DisplayName))] [LocalizedDescription(nameof(Resources.IndicoScope_Description))] public class IndicoScope : NativeActivity diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/ListDatasets.cs b/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/ListDatasets.cs index 2e8f81d..db89a26 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/ListDatasets.cs +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/ListDatasets.cs @@ -1,32 +1,32 @@ -//using System.Activities; -//using System.Threading; -//using System.Threading.Tasks; -//using System.Collections.Generic; -//using System.Linq; -//using Indico.RPAActivities.Activities.Activities; -//using Indico.RPAActivities.Activities.Properties; -//using UiPath.Shared.Activities.Localization; -//using IndicoV2.DataSets.Models; +using System.Activities; +using System.Threading; +using System.Threading.Tasks; +using System.Collections.Generic; +using System.Linq; +using Indico.RPAActivities.Activities.Activities; +using Indico.RPAActivities.Activities.Properties; +using Indico.UiPath.Shared.Activities.Localization; +using IndicoV2.DataSets.Models; -//namespace Indico.RPAActivities.Activities -//{ -// [LocalizedCategory(nameof(Resources.PreparationCategory))] -// [LocalizedDisplayName(nameof(Resources.ListDatasets_DisplayName))] -// [LocalizedDescription(nameof(Resources.ListDatasets_Description))] -// public class ListDatasets : IndicoActivityBase> -// { -// [LocalizedDisplayName(nameof(Resources.ListDatasets_Datasets_DisplayName))] -// [LocalizedDescription(nameof(Resources.ListDatasets_Datasets_Description))] -// [LocalizedCategory(nameof(Resources.Output_Category))] -// public OutArgument> Datasets { get; set; } - -// protected override bool GetInputs(AsyncCodeActivityContext ctx) => true; // no input, using dummy bool +namespace Indico.RPAActivities.Activities +{ + + [LocalizedDisplayName(nameof(Resources.ListDatasets_DisplayName))] + [LocalizedDescription(nameof(Resources.ListDatasets_Description))] + public class ListDatasets : IndicoActivityBase> + { + [LocalizedDisplayName(nameof(Resources.ListDatasets_Datasets_DisplayName))] + [LocalizedDescription(nameof(Resources.ListDatasets_Datasets_Description))] + [LocalizedCategory(nameof(Resources.Output_Category))] + public OutArgument> Datasets { get; set; } -// protected override async Task> ExecuteAsync(bool input, CancellationToken cancellationToken) => -// (await Application.ListDatasets(cancellationToken)).ToList(); + protected override bool GetInputs(AsyncCodeActivityContext ctx) => true; // no input, using dummy bool -// protected override void SetOutputs(AsyncCodeActivityContext ctx, List output) => -// Datasets.Set(ctx, output); -// } -//} + protected override async Task> ExecuteWithTimeout(bool input, CancellationToken cancellationToken) => + await Application.ListDatasets(cancellationToken); + + protected override void SetResults(AsyncCodeActivityContext ctx, IEnumerable output) => + Datasets.Set(ctx, output.ToList()); + } +} diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/ListSubmissions.cs b/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/ListSubmissions.cs index a120da3..034fd7d 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/ListSubmissions.cs +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/ListSubmissions.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using Indico.RPAActivities.Activities.Properties; using Indico.RPAActivities.Activities.Activities; -using UiPath.Shared.Activities.Localization; +using Indico.UiPath.Shared.Activities.Localization; using IndicoV2.Submissions.Models; using System; using System.Linq; @@ -13,7 +13,7 @@ namespace Indico.RPAActivities.Activities { [LocalizedDisplayName(nameof(Resources.ListSubmissions_DisplayName))] [LocalizedDescription(nameof(Resources.ListSubmissions_Description))] - public class ListSubmissions : IndicoActivityBase<(List WorkflowIds, List SubmissionIds, string InputFilename, SubmissionStatus? Status, bool? Retrieved, int Limit), List> + public class ListSubmissions : IndicoActivityBase<(List WorkflowIds, List SubmissionIds, string InputFilename, SubmissionStatus? Status, bool? Retrieved, int Limit), IEnumerable> { [LocalizedDisplayName(nameof(Resources.ListSubmissions_SubmissionIDs_DisplayName))] [LocalizedDescription(nameof(Resources.ListSubmissions_SubmissionIDs_Description))] @@ -56,56 +56,22 @@ protected override void CacheMetadata(CodeActivityMetadata metadata) base.CacheMetadata(metadata); } - protected override async Task> ExecuteAsync(AsyncCodeActivityContext context, CancellationToken cancellationToken) - { - // Inputs - var timeout = TimeoutMS.Get(context); - - var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken); - cts.CancelAfter(timeout); - - // Set a timeout on the execution - var task = ExecuteWithTimeout(context, cts.Token); - var timer = Task.Delay(timeout, cts.Token); - var completedTask = await Task.WhenAny(task, timer); - if (completedTask == task) - { - // Outputs - return (ctx) => - { - Results(ctx, task.Result); - }; - } - - else - { - throw new TimeoutException(Resources.Timeout_Error); - } - - - } - protected void Results(AsyncCodeActivityContext context, IEnumerable result) + protected override void SetResults(AsyncCodeActivityContext context, IEnumerable result) { Submissions.Set(context,result?.ToList()); } - protected async Task> ExecuteWithTimeout(AsyncCodeActivityContext context, CancellationToken cancellationToken = default) - { - /////////////////////////// - // Add execution logic HERE - /////////////////////////// - /// - var submissionIds = SubmissionIDs.Get(context); - var workflowIds = WorkflowIDs.Get(context); - var retrieved = Retrieved.Get(context); - var limit = Limit.Get(context); - var inputFilename = InputFilename.Get(context); - var submissionStatus = Status.Get(context); + protected override async Task> ExecuteWithTimeout((List WorkflowIds, List SubmissionIds, string InputFilename, SubmissionStatus? Status, bool? Retrieved, int Limit) p, CancellationToken cancellationToken = default) + { - return await Application.ListSubmissions(submissionIds, workflowIds, inputFilename, submissionStatus, retrieved, limit, cancellationToken); + return await Application.ListSubmissions(p.SubmissionIds, p.WorkflowIds, p.InputFilename, p.Status, p.Retrieved, p.Limit, cancellationToken); } + protected override (List WorkflowIds, List SubmissionIds, string InputFilename, SubmissionStatus? Status, bool? Retrieved, int Limit) GetInputs(AsyncCodeActivityContext ctx) + { + return (WorkflowIDs.Get(ctx), SubmissionIDs.Get(ctx), InputFilename.Get(ctx), Status.Get(ctx), Retrieved.Get(ctx), Limit.Get(ctx)); + } } } diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/ListWithTimeout.cs b/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/ListWithTimeout.cs index 70e52d4..f35ae72 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/ListWithTimeout.cs +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/ListWithTimeout.cs @@ -3,8 +3,8 @@ //using System.Threading; //using System.Threading.Tasks; //using Indico.RPAActivities.Activities.Properties; -//using UiPath.Shared.Activities; -//using UiPath.Shared.Activities.Localization; +//using Indico.UiPath.Shared.Activities; +//using Indico.UiPath.Shared.Activities.Localization; //namespace Indico.RPAActivities.Activities //{ diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/ListWorkflows.cs b/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/ListWorkflows.cs index 84a0edd..738f82b 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/ListWorkflows.cs +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/ListWorkflows.cs @@ -1,36 +1,35 @@ -//using System.Activities; -//using System.Collections.Generic; -//using System.Linq; -//using System.Threading; -//using System.Threading.Tasks; -//using Indico.RPAActivities.Activities.Activities; -//using Indico.RPAActivities.Activities.Properties; -//using UiPath.Shared.Activities.Localization; -//using IndicoV2.Workflows.Models; +using System.Activities; +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using Indico.RPAActivities.Activities.Activities; +using Indico.RPAActivities.Activities.Properties; +using Indico.UiPath.Shared.Activities.Localization; +using IndicoV2.Workflows.Models; -//namespace Indico.RPAActivities.Activities -//{ -// [LocalizedCategory(nameof(Resources.WorkflowCategory))] -// [LocalizedDisplayName(nameof(Resources.ListWorkflows_DisplayName))] -// [LocalizedDescription(nameof(Resources.ListWorkflows_Description))] -// public class ListWorkflows : IndicoActivityBase> -// { -// [LocalizedDisplayName(nameof(Resources.ListWorkflows_DatasetID_DisplayName))] -// [LocalizedDescription(nameof(Resources.ListWorkflows_DatasetID_Description))] -// [LocalizedCategory(nameof(Resources.Input_Category))] -// [RequiredArgument] -// public InArgument DatasetID { get; set; } +namespace Indico.RPAActivities.Activities +{ + [LocalizedDisplayName(nameof(Resources.ListWorkflows_DisplayName))] + [LocalizedDescription(nameof(Resources.ListWorkflows_Description))] + public class ListWorkflows : IndicoActivityBase> + { + [LocalizedDisplayName(nameof(Resources.ListWorkflows_DatasetID_DisplayName))] + [LocalizedDescription(nameof(Resources.ListWorkflows_DatasetID_Description))] + [LocalizedCategory(nameof(Resources.Input_Category))] + [RequiredArgument] + public InArgument DatasetID { get; set; } -// [LocalizedDisplayName(nameof(Resources.ListWorkflows_Workflows_DisplayName))] -// [LocalizedDescription(nameof(Resources.ListWorkflows_Workflows_Description))] -// [LocalizedCategory(nameof(Resources.Output_Category))] -// public OutArgument> Workflows { get; set; } + [LocalizedDisplayName(nameof(Resources.ListWorkflows_Workflows_DisplayName))] + [LocalizedDescription(nameof(Resources.ListWorkflows_Workflows_Description))] + [LocalizedCategory(nameof(Resources.Output_Category))] + public OutArgument> Workflows { get; set; } -// protected override int GetInputs(AsyncCodeActivityContext ctx) => DatasetID.Get(ctx); + protected override int GetInputs(AsyncCodeActivityContext ctx) => DatasetID.Get(ctx); -// protected override async Task> ExecuteAsync(int dataSetId, CancellationToken cancellationToken) => -// (await Application.ListWorkflows(dataSetId, cancellationToken)).ToList(); + protected override async Task> ExecuteWithTimeout(int dataSetId, CancellationToken cancellationToken) => + await Application.ListWorkflows(dataSetId, cancellationToken); -// protected override void SetOutputs(AsyncCodeActivityContext ctx, List output) => Workflows.Set(ctx, output); -// } -//} + protected override void SetResults(AsyncCodeActivityContext ctx, IEnumerable output) => Workflows.Set(ctx, output.ToList()); + } +} diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/SubmissionResult.cs b/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/SubmissionResult.cs index 2684587..bcd9ddf 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/SubmissionResult.cs +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/SubmissionResult.cs @@ -1,42 +1,41 @@ -//using System.Activities; -//using System.Threading; -//using System.Threading.Tasks; -//using Indico.RPAActivities.Activities.Activities; -//using Newtonsoft.Json.Linq; -//using Indico.RPAActivities.Activities.Properties; -//using UiPath.Shared.Activities.Localization; -//using IndicoV2.Submissions.Models; +using System.Activities; +using System.Threading; +using System.Threading.Tasks; +using Indico.RPAActivities.Activities.Activities; +using Newtonsoft.Json.Linq; +using Indico.RPAActivities.Activities.Properties; +using Indico.UiPath.Shared.Activities.Localization; +using IndicoV2.Submissions.Models; -//namespace Indico.RPAActivities.Activities -//{ -// [LocalizedCategory(nameof(Resources.SubmissionCategory))] -// [LocalizedDisplayName(nameof(Resources.SubmissionResult_DisplayName))] -// [LocalizedDescription(nameof(Resources.SubmissionResult_Description))] -// public class SubmissionResult : IndicoActivityBase<(int SubmissionId, SubmissionStatus? CheckStatus), JObject> -// { -// [LocalizedDisplayName(nameof(Resources.SubmissionResult_SubmissionID_DisplayName))] -// [LocalizedDescription(nameof(Resources.SubmissionResult_SubmissionID_Description))] -// [LocalizedCategory(nameof(Resources.Input_Category))] -// [RequiredArgument] -// public InArgument SubmissionID { get; set; } +namespace Indico.RPAActivities.Activities +{ + [LocalizedDisplayName(nameof(Resources.SubmissionResult_DisplayName))] + [LocalizedDescription(nameof(Resources.SubmissionResult_Description))] + public class SubmissionResult : IndicoActivityBase<(int SubmissionId, SubmissionStatus? CheckStatus), JObject> + { + [LocalizedDisplayName(nameof(Resources.SubmissionResult_SubmissionID_DisplayName))] + [LocalizedDescription(nameof(Resources.SubmissionResult_SubmissionID_Description))] + [LocalizedCategory(nameof(Resources.Input_Category))] + [RequiredArgument] + public InArgument SubmissionID { get; set; } -// [LocalizedDisplayName(nameof(Resources.SubmissionResult_CheckStatus_DisplayName))] -// [LocalizedDescription(nameof(Resources.SubmissionResult_CheckStatus_Description))] -// [LocalizedCategory(nameof(Resources.Input_Category))] -// public InArgument CheckStatus { get; set; } + [LocalizedDisplayName(nameof(Resources.SubmissionResult_CheckStatus_DisplayName))] + [LocalizedDescription(nameof(Resources.SubmissionResult_CheckStatus_Description))] + [LocalizedCategory(nameof(Resources.Input_Category))] + public InArgument CheckStatus { get; set; } -// [LocalizedDisplayName(nameof(Resources.SubmissionResult_Result_DisplayName))] -// [LocalizedDescription(nameof(Resources.SubmissionResult_Result_Description))] -// [LocalizedCategory(nameof(Resources.Output_Category))] -// public OutArgument Result { get; set; } - -// protected override (int SubmissionId, SubmissionStatus? CheckStatus) GetInputs(AsyncCodeActivityContext ctx) => -// (SubmissionID.Get(ctx), CheckStatus.Get(ctx)); + [LocalizedDisplayName(nameof(Resources.SubmissionResult_Result_DisplayName))] + [LocalizedDescription(nameof(Resources.SubmissionResult_Result_Description))] + [LocalizedCategory(nameof(Resources.Output_Category))] + public OutArgument Result { get; set; } -// protected override Task ExecuteAsync((int SubmissionId, SubmissionStatus? CheckStatus) input, CancellationToken cancellationToken) => -// Application.SubmissionResult(input.SubmissionId, input.CheckStatus, cancellationToken); + protected override (int SubmissionId, SubmissionStatus? CheckStatus) GetInputs(AsyncCodeActivityContext ctx) => + (SubmissionID.Get(ctx), CheckStatus.Get(ctx)); -// protected override void SetOutputs(AsyncCodeActivityContext ctx, JObject output) => Result.Set(ctx, output); -// } -//} + protected async override Task ExecuteWithTimeout((int SubmissionId, SubmissionStatus? CheckStatus) input, CancellationToken cancellationToken) => + await Application.SubmissionResult(input.SubmissionId, input.CheckStatus, cancellationToken); + + protected override void SetResults(AsyncCodeActivityContext ctx, JObject output) => Result.Set(ctx, output); + } +} diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/SubmitReview.cs b/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/SubmitReview.cs index ca48b34..d9c9e9b 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/SubmitReview.cs +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/SubmitReview.cs @@ -1,51 +1,51 @@ -//using System.Activities; -//using System.Threading; -//using System.Threading.Tasks; -//using Indico.RPAActivities.Activities.Activities; -//using Newtonsoft.Json.Linq; -//using Indico.RPAActivities.Activities.Properties; -//using UiPath.Shared.Activities.Localization; - -//namespace Indico.RPAActivities.Activities -//{ -// [LocalizedCategory(nameof(Resources.SubmissionCategory))] -// [LocalizedDisplayName(nameof(Resources.SubmitReview_DisplayName))] -// [LocalizedDescription(nameof(Resources.SubmitReview_Description))] -// public class SubmitReview : IndicoActivityBase<(int SubmissionId, JObject Changes, bool Rejected, bool? ForceComplete), JObject> -// { -// [LocalizedDisplayName(nameof(Resources.SubmitReview_SubmissionID_DisplayName))] -// [LocalizedDescription(nameof(Resources.SubmitReview_SubmissionID_Description))] -// [LocalizedCategory(nameof(Resources.Input_Category))] -// [RequiredArgument] -// public InArgument SubmissionID { get; set; } - -// [LocalizedDisplayName(nameof(Resources.SubmitReview_Changes_DisplayName))] -// [LocalizedDescription(nameof(Resources.SubmitReview_Changes_Description))] -// [LocalizedCategory(nameof(Resources.Input_Category))] -// public InArgument Changes { get; set; } - -// [LocalizedDisplayName(nameof(Resources.SubmitReview_Rejected_DisplayName))] -// [LocalizedDescription(nameof(Resources.SubmitReview_Rejected_Description))] -// [LocalizedCategory(nameof(Resources.Input_Category))] -// public InArgument Rejected { get; set; } = false; - -// [LocalizedDisplayName(nameof(Resources.SubmitReview_ForceComplete_DisplayName))] -// [LocalizedDescription(nameof(Resources.SubmitReview_ForceComplete_Description))] -// [LocalizedCategory(nameof(Resources.Input_Category))] -// public InArgument ForceComplete { get; set; } - -// [LocalizedDisplayName(nameof(Resources.SubmitReview_Result_DisplayName))] -// [LocalizedDescription(nameof(Resources.SubmitReview_Result_Description))] -// [LocalizedCategory(nameof(Resources.Output_Category))] -// public OutArgument Result { get; set; } - -// protected override (int SubmissionId, JObject Changes, bool Rejected, bool? ForceComplete) GetInputs(AsyncCodeActivityContext ctx) -// => (SubmissionID.Get(ctx), Changes.Get(ctx), Rejected.Get(ctx), ForceComplete.Get(ctx)); - -// protected override Task ExecuteAsync((int SubmissionId, JObject Changes, bool Rejected, bool? ForceComplete) input, CancellationToken cancellationToken) -// => Application.SubmitReview(input.SubmissionId, input.Changes, input.Rejected, input.ForceComplete, cancellationToken); - -// protected override void SetOutputs(AsyncCodeActivityContext ctx, JObject output) => Result.Set(ctx, output); -// } -//} +using System.Activities; +using System.Threading; +using System.Threading.Tasks; +using Indico.RPAActivities.Activities.Activities; +using Newtonsoft.Json.Linq; +using Indico.RPAActivities.Activities.Properties; +using Indico.UiPath.Shared.Activities.Localization; + +namespace Indico.RPAActivities.Activities +{ + + [LocalizedDisplayName(nameof(Resources.SubmitReview_DisplayName))] + [LocalizedDescription(nameof(Resources.SubmitReview_Description))] + public class SubmitReview : IndicoActivityBase<(int SubmissionId, JObject Changes, bool Rejected, bool? ForceComplete), JObject> + { + [LocalizedDisplayName(nameof(Resources.SubmitReview_SubmissionID_DisplayName))] + [LocalizedDescription(nameof(Resources.SubmitReview_SubmissionID_Description))] + [LocalizedCategory(nameof(Resources.Input_Category))] + [RequiredArgument] + public InArgument SubmissionID { get; set; } + + [LocalizedDisplayName(nameof(Resources.SubmitReview_Changes_DisplayName))] + [LocalizedDescription(nameof(Resources.SubmitReview_Changes_Description))] + [LocalizedCategory(nameof(Resources.Input_Category))] + public InArgument Changes { get; set; } + + [LocalizedDisplayName(nameof(Resources.SubmitReview_Rejected_DisplayName))] + [LocalizedDescription(nameof(Resources.SubmitReview_Rejected_Description))] + [LocalizedCategory(nameof(Resources.Input_Category))] + public InArgument Rejected { get; set; } = false; + + [LocalizedDisplayName(nameof(Resources.SubmitReview_ForceComplete_DisplayName))] + [LocalizedDescription(nameof(Resources.SubmitReview_ForceComplete_Description))] + [LocalizedCategory(nameof(Resources.Input_Category))] + public InArgument ForceComplete { get; set; } + + [LocalizedDisplayName(nameof(Resources.SubmitReview_Result_DisplayName))] + [LocalizedDescription(nameof(Resources.SubmitReview_Result_Description))] + [LocalizedCategory(nameof(Resources.Output_Category))] + public OutArgument Result { get; set; } + + protected override (int SubmissionId, JObject Changes, bool Rejected, bool? ForceComplete) GetInputs(AsyncCodeActivityContext ctx) + => (SubmissionID.Get(ctx), Changes.Get(ctx), Rejected.Get(ctx), ForceComplete.Get(ctx)); + + protected override Task ExecuteWithTimeout((int SubmissionId, JObject Changes, bool Rejected, bool? ForceComplete) input, CancellationToken cancellationToken) + => Application.SubmitReview(input.SubmissionId, input.Changes, input.Rejected, input.ForceComplete, cancellationToken); + + protected override void SetResults(AsyncCodeActivityContext ctx, JObject output) => Result.Set(ctx, output); + } +} diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/WorkflowSubmission.cs b/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/WorkflowSubmission.cs index e50ef3b..8f8c435 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/WorkflowSubmission.cs +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities/Activities/WorkflowSubmission.cs @@ -1,68 +1,68 @@ -//using System.Activities; -//using System.Threading; -//using System.Threading.Tasks; -//using System.Collections.Generic; -//using Indico.RPAActivities.Activities.Activities; -//using Indico.RPAActivities.Activities.Properties; -//using System.Linq; -//using System; -//using UiPath.Shared.Activities.Localization; +using System.Activities; +using System.Threading; +using System.Threading.Tasks; +using System.Collections.Generic; +using Indico.RPAActivities.Activities.Activities; +using Indico.RPAActivities.Activities.Properties; +using System.Linq; +using System; +using Indico.UiPath.Shared.Activities.Localization; -//namespace Indico.RPAActivities.Activities -//{ -// [LocalizedCategory(nameof(Resources.WorkflowCategory))] -// [LocalizedDisplayName(nameof(Resources.WorkflowSubmission_DisplayName))] -// [LocalizedDescription(nameof(Resources.WorkflowSubmission_Description))] -// public class WorkflowSubmission : IndicoActivityBase<(int WorkflowId, List FilePaths, List Urls), List> -// { -// [LocalizedDisplayName(nameof(Resources.WorkflowSubmission_WorkflowID_DisplayName))] -// [LocalizedDescription(nameof(Resources.WorkflowSubmission_WorkflowID_Description))] -// [LocalizedCategory(nameof(Resources.Input_Category))] -// [RequiredArgument] -// public InArgument WorkflowID { get; set; } +namespace Indico.RPAActivities.Activities +{ + + [LocalizedDisplayName(nameof(Resources.WorkflowSubmission_DisplayName))] + [LocalizedDescription(nameof(Resources.WorkflowSubmission_Description))] + public class WorkflowSubmission : IndicoActivityBase<(int WorkflowId, List FilePaths, List Urls), IEnumerable> + { + [LocalizedDisplayName(nameof(Resources.WorkflowSubmission_WorkflowID_DisplayName))] + [LocalizedDescription(nameof(Resources.WorkflowSubmission_WorkflowID_Description))] + [LocalizedCategory(nameof(Resources.Input_Category))] + [RequiredArgument] + public InArgument WorkflowID { get; set; } -// [LocalizedDisplayName(nameof(Resources.WorkflowSubmission_FilePaths_DisplayName))] -// [LocalizedDescription(nameof(Resources.WorkflowSubmission_FilePaths_Description))] -// [LocalizedCategory(nameof(Resources.Input_Category))] -// public InArgument> FilePaths { get; set; } + [LocalizedDisplayName(nameof(Resources.WorkflowSubmission_FilePaths_DisplayName))] + [LocalizedDescription(nameof(Resources.WorkflowSubmission_FilePaths_Description))] + [LocalizedCategory(nameof(Resources.Input_Category))] + public InArgument> FilePaths { get; set; } -// [LocalizedDisplayName(nameof(Resources.WorkflowSubmission_Urls_DisplayName))] -// [LocalizedDescription(nameof(Resources.WorkflowSubmission_Urls_Description))] -// [LocalizedCategory(nameof(Resources.Input_Category))] -// public InArgument> Urls { get; set; } + [LocalizedDisplayName(nameof(Resources.WorkflowSubmission_Urls_DisplayName))] + [LocalizedDescription(nameof(Resources.WorkflowSubmission_Urls_Description))] + [LocalizedCategory(nameof(Resources.Input_Category))] + public InArgument> Urls { get; set; } -// [LocalizedDisplayName(nameof(Resources.WorkflowSubmission_SubmissionIDs_DisplayName))] -// [LocalizedDescription(nameof(Resources.WorkflowSubmission_SubmissionIDs_Description))] -// [LocalizedCategory(nameof(Resources.Output_Category))] -// public OutArgument> SubmissionIDs { get; set; } + [LocalizedDisplayName(nameof(Resources.WorkflowSubmission_SubmissionIDs_DisplayName))] + [LocalizedDescription(nameof(Resources.WorkflowSubmission_SubmissionIDs_Description))] + [LocalizedCategory(nameof(Resources.Output_Category))] + public OutArgument> SubmissionIDs { get; set; } -// protected override (int WorkflowId, List FilePaths, List Urls) GetInputs(AsyncCodeActivityContext ctx) -// => (WorkflowID.Get(ctx), FilePaths.Get(ctx), Urls.Get(ctx)); + protected override (int WorkflowId, List FilePaths, List Urls) GetInputs(AsyncCodeActivityContext ctx) + => (WorkflowID.Get(ctx), FilePaths.Get(ctx), Urls.Get(ctx)); -// protected override async Task> ExecuteAsync((int WorkflowId, List FilePaths, List Urls) input, CancellationToken cancellationToken) -// { -// var filePathsProvided = ValuesProvided(input.FilePaths); -// var urisProvided = ValuesProvided(input.Urls); + protected override async Task> ExecuteWithTimeout((int WorkflowId, List FilePaths, List Urls) input, CancellationToken cancellationToken) + { + var filePathsProvided = ValuesProvided(input.FilePaths); + var urisProvided = ValuesProvided(input.Urls); -// if (filePathsProvided && urisProvided || !filePathsProvided && !urisProvided) -// { -// throw new ArgumentException(string.Format(Resources.ValidationExclusiveProperties_Error, nameof(FilePaths), nameof(Urls))); -// } + if (filePathsProvided && urisProvided || !filePathsProvided && !urisProvided) + { + throw new ArgumentException(string.Format(Resources.ValidationExclusiveProperties_Error, nameof(FilePaths), nameof(Urls))); + } -// return (await Application.WorkflowSubmission(input.WorkflowId, input.FilePaths, input.Urls, cancellationToken)).ToList(); -// } + return await Application.WorkflowSubmission(input.WorkflowId, input.FilePaths, input.Urls, cancellationToken); + } -// private bool ValuesProvided(IEnumerable enumerable) -// { -// if (enumerable == null || !enumerable.Any()) -// { -// return true; -// } + private bool ValuesProvided(IEnumerable enumerable) + { + if (enumerable == null || !enumerable.Any()) + { + return true; + } -// return false; -// } + return false; + } -// protected override void SetOutputs(AsyncCodeActivityContext ctx, List output) => SubmissionIDs.Set(ctx, output); -// } -//} + protected override void SetResults(AsyncCodeActivityContext ctx, IEnumerable output) => SubmissionIDs.Set(ctx, output.ToList()); + } +} diff --git a/Indico.RPAActivities/Indico.RPAActivities.Activities/Properties/SharedResources.cs b/Indico.RPAActivities/Indico.RPAActivities.Activities/Properties/SharedResources.cs index 0440413..dc9a951 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.Activities/Properties/SharedResources.cs +++ b/Indico.RPAActivities/Indico.RPAActivities.Activities/Properties/SharedResources.cs @@ -1,4 +1,4 @@ -namespace UiPath.Shared.Localization +namespace Indico.UiPath.Shared.Localization { class SharedResources : Indico.RPAActivities.Activities.Properties.Resources { diff --git a/Indico.RPAActivities/Indico.RPAActivities.IntegrationTests/Activities/DocumentExtractionTests.cs b/Indico.RPAActivities/Indico.RPAActivities.IntegrationTests/Activities/DocumentExtractionTests.cs index cbed72a..3e757bb 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.IntegrationTests/Activities/DocumentExtractionTests.cs +++ b/Indico.RPAActivities/Indico.RPAActivities.IntegrationTests/Activities/DocumentExtractionTests.cs @@ -19,11 +19,11 @@ public class DocumentExtractionTests [Theory] public void DocumentExtraction_ShouldReturnResult(DocumentExtractionPreset preset) => new DocumentExtraction - { - Document = _testData.GetFilePath(), - TimeoutMS = (int)TimeSpan.FromMinutes(10).TotalMilliseconds, - Preset = preset, - } + { + Document = _testData.GetFilePath(), + TimeoutMS = (int)TimeSpan.FromMinutes(10).TotalMilliseconds, + Preset = preset, + } .Invoke() .Should() .StartWith("Our Google properties revenues"); diff --git a/Indico.RPAActivities/Indico.RPAActivities.IntegrationTests/Helpers/TaskActivityExtensions.cs b/Indico.RPAActivities/Indico.RPAActivities.IntegrationTests/Helpers/TaskActivityExtensions.cs index e63bf0a..2d325de 100644 --- a/Indico.RPAActivities/Indico.RPAActivities.IntegrationTests/Helpers/TaskActivityExtensions.cs +++ b/Indico.RPAActivities/Indico.RPAActivities.IntegrationTests/Helpers/TaskActivityExtensions.cs @@ -16,27 +16,27 @@ internal static class TaskActivityExtensions private static string BaseUrl => Environment.GetEnvironmentVariable("INDICO_HOST"); private static string ApiToken => Environment.GetEnvironmentVariable("INDICO_TOKEN"); - //public static List Invoke(this ListDatasets listDataSetsActivity) => - // listDataSetsActivity.Invoke>((lds, output) => lds.Datasets = output); + public static List Invoke(this ListDatasets listDataSetsActivity) => + listDataSetsActivity.Invoke>((lds, output) => lds.Datasets = output); - //public static List Invoke(this ListWorkflows listWorkflowsActivity) => - // listWorkflowsActivity.Invoke>((a, output) => a.Workflows = output); + public static List Invoke(this ListWorkflows listWorkflowsActivity) => + listWorkflowsActivity.Invoke>((a, output) => a.Workflows = output); - //public static List Invoke(this WorkflowSubmission workflowSubmissionActivity) => - // workflowSubmissionActivity - //.Invoke>((a, output) => a.SubmissionIDs = output); + public static List Invoke(this WorkflowSubmission workflowSubmissionActivity) => + workflowSubmissionActivity + .Invoke>((a, output) => a.SubmissionIDs = output); public static List Invoke(this ListSubmissions listSubmissions) => listSubmissions.Invoke>((a, outArg) => a.Submissions = outArg); - //public static JObject Invoke(this SubmissionResult submissionResultActivity) => - // submissionResultActivity.Invoke((a, outArg) => a.Result = outArg); + public static JObject Invoke(this SubmissionResult submissionResultActivity) => + submissionResultActivity.Invoke((a, outArg) => a.Result = outArg); - //public static JObject Invoke(this SubmitReview submitReviewActivity) => - // submitReviewActivity.Invoke((a, outArg) => a.Result = outArg); + public static JObject Invoke(this SubmitReview submitReviewActivity) => + submitReviewActivity.Invoke((a, outArg) => a.Result = outArg); - //public static string Invoke(this DocumentExtraction documentExtractionActivity) => - // documentExtractionActivity.Invoke((a, outArg) => a.Results = outArg); + public static string Invoke(this DocumentExtraction documentExtractionActivity) => + documentExtractionActivity.Invoke((a, outArg) => a.Results = outArg); public static TOutput Invoke(this TActivity activity, Action> setOutput) where TActivity : Activity diff --git a/Indico.RPAActivities/Indico.RPAActivities/Properties/SharedResources.cs b/Indico.RPAActivities/Indico.RPAActivities/Properties/SharedResources.cs index 11c537e..bc35123 100644 --- a/Indico.RPAActivities/Indico.RPAActivities/Properties/SharedResources.cs +++ b/Indico.RPAActivities/Indico.RPAActivities/Properties/SharedResources.cs @@ -1,4 +1,4 @@ -namespace UiPath.Shared.Localization +namespace Indico.UiPath.Shared.Localization { class SharedResources : Indico.RPAActivities.Properties.Resources { diff --git a/Shared/Themes/Generic.xaml b/Shared/Themes/Generic.xaml index 2352d5a..d3311d0 100644 --- a/Shared/Themes/Generic.xaml +++ b/Shared/Themes/Generic.xaml @@ -2,8 +2,8 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System.Windows.Controls.Primitives;assembly=PresentationFramework" - xmlns:src="clr-namespace:UiPath.Shared.Activities.Design.Controls" - xmlns:loc="clr-namespace:UiPath.Shared.Localization" + xmlns:src="clr-namespace:Indico.UiPath.Shared.Activities.Design.Controls" + xmlns:loc="clr-namespace:Indico.UiPath.Shared.Localization" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:sapv="clr-namespace:System.Activities.Presentation.View;assembly=System.Activities.Presentation" xmlns:sap="clr-namespace:System.Activities.Presentation;assembly=System.Activities.Presentation"> diff --git a/Shared/UiPath.Shared.Activities.Design/Controls/ActivityDecoratorControl.cs b/Shared/UiPath.Shared.Activities.Design/Controls/ActivityDecoratorControl.cs index 1766b3b..bb68be3 100644 --- a/Shared/UiPath.Shared.Activities.Design/Controls/ActivityDecoratorControl.cs +++ b/Shared/UiPath.Shared.Activities.Design/Controls/ActivityDecoratorControl.cs @@ -1,7 +1,7 @@ using System.Windows; using System.Windows.Controls; -namespace UiPath.Shared.Activities.Design.Controls +namespace Indico.UiPath.Shared.Activities.Design.Controls { public class ActivityDecoratorControl : ContentControl { diff --git a/Shared/UiPath.Shared.Activities.Design/Controls/ComboboxControl.xaml b/Shared/UiPath.Shared.Activities.Design/Controls/ComboboxControl.xaml index 97d5739..0c22f8a 100644 --- a/Shared/UiPath.Shared.Activities.Design/Controls/ComboboxControl.xaml +++ b/Shared/UiPath.Shared.Activities.Design/Controls/ComboboxControl.xaml @@ -1,4 +1,4 @@ - /// Interaction logic for ComboboxControl.xaml diff --git a/Shared/UiPath.Shared.Activities.Design/Controls/FilePathControl.xaml b/Shared/UiPath.Shared.Activities.Design/Controls/FilePathControl.xaml index 941111d..f0c034d 100644 --- a/Shared/UiPath.Shared.Activities.Design/Controls/FilePathControl.xaml +++ b/Shared/UiPath.Shared.Activities.Design/Controls/FilePathControl.xaml @@ -1,4 +1,4 @@ - /// Interaction logic for FilePathControl.xaml diff --git a/Shared/UiPath.Shared.Activities.Design/Controls/RestrictiveBodyConnector.xaml b/Shared/UiPath.Shared.Activities.Design/Controls/RestrictiveBodyConnector.xaml index 3393da5..442bf99 100644 --- a/Shared/UiPath.Shared.Activities.Design/Controls/RestrictiveBodyConnector.xaml +++ b/Shared/UiPath.Shared.Activities.Design/Controls/RestrictiveBodyConnector.xaml @@ -1,4 +1,4 @@ - /// Interaction logic for RestrictiveBodyConnector.xaml diff --git a/Shared/UiPath.Shared.Activities.Design/Converters/ActivityIconConverter.cs b/Shared/UiPath.Shared.Activities.Design/Converters/ActivityIconConverter.cs index 9d865f8..9d157c7 100644 --- a/Shared/UiPath.Shared.Activities.Design/Converters/ActivityIconConverter.cs +++ b/Shared/UiPath.Shared.Activities.Design/Converters/ActivityIconConverter.cs @@ -4,7 +4,7 @@ using System.Windows.Data; using System.Windows.Media; -namespace UiPath.Shared.Activities.Design.Converters +namespace Indico.UiPath.Shared.Activities.Design.Converters { public class ActivityIconConverter : IValueConverter { diff --git a/Shared/UiPath.Shared.Activities.Design/Converters/ArrayToStringConverter.cs b/Shared/UiPath.Shared.Activities.Design/Converters/ArrayToStringConverter.cs index 450a80c..ebfcbb4 100644 --- a/Shared/UiPath.Shared.Activities.Design/Converters/ArrayToStringConverter.cs +++ b/Shared/UiPath.Shared.Activities.Design/Converters/ArrayToStringConverter.cs @@ -2,7 +2,7 @@ using System.Globalization; using System.Windows.Data; -namespace UiPath.Shared.Activities.Design.Converters +namespace Indico.UiPath.Shared.Activities.Design.Converters { public class ArrayToStringConverter : IMultiValueConverter { diff --git a/Shared/UiPath.Shared.Activities.Design/Converters/StringArgumentToComboboxConverter.cs b/Shared/UiPath.Shared.Activities.Design/Converters/StringArgumentToComboboxConverter.cs index 781a7a8..513a648 100644 --- a/Shared/UiPath.Shared.Activities.Design/Converters/StringArgumentToComboboxConverter.cs +++ b/Shared/UiPath.Shared.Activities.Design/Converters/StringArgumentToComboboxConverter.cs @@ -6,7 +6,7 @@ using System.Globalization; using System.Windows.Data; -namespace UiPath.Shared.Activities.Design.Converters +namespace Indico.UiPath.Shared.Activities.Design.Converters { public class StringArgumentToComboboxConverter : IValueConverter { diff --git a/Shared/UiPath.Shared.Activities.Design/Editors/ArgumentCollectionEditor.cs b/Shared/UiPath.Shared.Activities.Design/Editors/ArgumentCollectionEditor.cs index 86688fe..22805e3 100644 --- a/Shared/UiPath.Shared.Activities.Design/Editors/ArgumentCollectionEditor.cs +++ b/Shared/UiPath.Shared.Activities.Design/Editors/ArgumentCollectionEditor.cs @@ -3,10 +3,10 @@ using System.Activities.Presentation.Model; using System.Activities.Presentation.PropertyEditing; using System.Windows; -using UiPath.Shared.Activities.Design.Editors; -using UiPath.Shared.Localization; +using Indico.UiPath.Shared.Activities.Design.Editors; +using Indico.UiPath.Shared.Localization; -namespace UiPath.Shared.Activities.Design.Editors +namespace Indico.UiPath.Shared.Activities.Design.Editors { public partial class ArgumentCollectionEditor : DialogPropertyValueEditor { diff --git a/Shared/UiPath.Shared.Activities.Design/Editors/ArgumentDictionaryEditor.cs b/Shared/UiPath.Shared.Activities.Design/Editors/ArgumentDictionaryEditor.cs index 991f44a..87d04c2 100644 --- a/Shared/UiPath.Shared.Activities.Design/Editors/ArgumentDictionaryEditor.cs +++ b/Shared/UiPath.Shared.Activities.Design/Editors/ArgumentDictionaryEditor.cs @@ -4,7 +4,7 @@ using System.Activities.Presentation.PropertyEditing; using System.Windows; -namespace UiPath.Shared.Activities.Design.Editors +namespace Indico.UiPath.Shared.Activities.Design.Editors { public class ArgumentDictionaryEditor : DialogPropertyValueEditor { diff --git a/Shared/UiPath.Shared.Activities.Design/Editors/EditorTemplates.xaml b/Shared/UiPath.Shared.Activities.Design/Editors/EditorTemplates.xaml index 93826c4..cb7f33f 100644 --- a/Shared/UiPath.Shared.Activities.Design/Editors/EditorTemplates.xaml +++ b/Shared/UiPath.Shared.Activities.Design/Editors/EditorTemplates.xaml @@ -1,9 +1,9 @@ - + xmlns:localization="clr-namespace:Indico.UiPath.Shared.Localization" + xmlns:editors="clr-namespace:Indico.UiPath.Shared.Activities.Design.Editors"> diff --git a/Shared/UiPath.Shared.Activities.Design/Editors/EditorTemplates.xaml.cs b/Shared/UiPath.Shared.Activities.Design/Editors/EditorTemplates.xaml.cs index 184def7..2ea1963 100644 --- a/Shared/UiPath.Shared.Activities.Design/Editors/EditorTemplates.xaml.cs +++ b/Shared/UiPath.Shared.Activities.Design/Editors/EditorTemplates.xaml.cs @@ -1,6 +1,6 @@ using System.Windows; -namespace UiPath.Shared.Activities.Design.Editors +namespace Indico.UiPath.Shared.Activities.Design.Editors { public partial class EditorTemplates { diff --git a/Shared/UiPath.Shared.Activities.Design/Editors/PasswordBoxAssistant.cs b/Shared/UiPath.Shared.Activities.Design/Editors/PasswordBoxAssistant.cs index 8b8760f..6592960 100644 --- a/Shared/UiPath.Shared.Activities.Design/Editors/PasswordBoxAssistant.cs +++ b/Shared/UiPath.Shared.Activities.Design/Editors/PasswordBoxAssistant.cs @@ -1,7 +1,7 @@ using System.Windows; using System.Windows.Controls; -namespace UiPath.Shared.Activities.Design.Editors +namespace Indico.UiPath.Shared.Activities.Design.Editors { public static class PasswordBoxAssistant { diff --git a/Shared/UiPath.Shared.Activities.Design/Editors/PasswordEditor.cs b/Shared/UiPath.Shared.Activities.Design/Editors/PasswordEditor.cs index c7ff67d..73c61bf 100644 --- a/Shared/UiPath.Shared.Activities.Design/Editors/PasswordEditor.cs +++ b/Shared/UiPath.Shared.Activities.Design/Editors/PasswordEditor.cs @@ -1,7 +1,7 @@ using System.Activities.Presentation.PropertyEditing; using System.Windows; -namespace UiPath.Shared.Activities.Design.Editors +namespace Indico.UiPath.Shared.Activities.Design.Editors { public class PasswordEditor : DialogPropertyValueEditor { diff --git a/Shared/UiPath.Shared.Activities.Design/Services/ModelItemExtensions.cs b/Shared/UiPath.Shared.Activities.Design/Services/ModelItemExtensions.cs index 5423678..3c6eef3 100644 --- a/Shared/UiPath.Shared.Activities.Design/Services/ModelItemExtensions.cs +++ b/Shared/UiPath.Shared.Activities.Design/Services/ModelItemExtensions.cs @@ -9,7 +9,7 @@ using System.Collections.ObjectModel; using System.Linq; -namespace UiPath.Shared.Activities.Design.Services +namespace Indico.UiPath.Shared.Activities.Design.Services { public static class ModelItemExtensions { diff --git a/Shared/UiPath.Shared.Activities.Design/Services/Xaml.cs b/Shared/UiPath.Shared.Activities.Design/Services/Xaml.cs index d9a797b..5e7419f 100644 --- a/Shared/UiPath.Shared.Activities.Design/Services/Xaml.cs +++ b/Shared/UiPath.Shared.Activities.Design/Services/Xaml.cs @@ -1,7 +1,7 @@ using System.IO; using System.Xaml; -namespace UiPath.Shared.Activities.Design.Services +namespace Indico.UiPath.Shared.Activities.Design.Services { public static class Xaml { diff --git a/Shared/UiPath.Shared.Activities/ActivitiesConstraints.cs b/Shared/UiPath.Shared.Activities/ActivitiesConstraints.cs index b0e0625..8fcf420 100644 --- a/Shared/UiPath.Shared.Activities/ActivitiesConstraints.cs +++ b/Shared/UiPath.Shared.Activities/ActivitiesConstraints.cs @@ -3,7 +3,7 @@ using System.Activities.Statements; using System.Activities.Validation; -namespace UiPath.Shared.Activities +namespace Indico.UiPath.Shared.Activities { public static class ActivityConstraints { diff --git a/Shared/UiPath.Shared.Activities/Attributes/ArgumentSettingAttribute.cs b/Shared/UiPath.Shared.Activities/Attributes/ArgumentSettingAttribute.cs index 2989da1..a132847 100644 --- a/Shared/UiPath.Shared.Activities/Attributes/ArgumentSettingAttribute.cs +++ b/Shared/UiPath.Shared.Activities/Attributes/ArgumentSettingAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace UiPath.Shared.Activities +namespace Indico.UiPath.Shared.Activities { [AttributeUsage(AttributeTargets.Property)] public sealed class ArgumentSettingAttribute : Attribute diff --git a/Shared/UiPath.Shared.Activities/Contracts/BaseChildActivity.cs b/Shared/UiPath.Shared.Activities/Contracts/BaseChildActivity.cs index 304a147..ff269bb 100644 --- a/Shared/UiPath.Shared.Activities/Contracts/BaseChildActivity.cs +++ b/Shared/UiPath.Shared.Activities/Contracts/BaseChildActivity.cs @@ -1,6 +1,6 @@ using System.Activities; -namespace UiPath.Shared.Activities.Contracts +namespace Indico.UiPath.Shared.Activities.Contracts { /// /// diff --git a/Shared/UiPath.Shared.Activities/IObjectContainer.cs b/Shared/UiPath.Shared.Activities/IObjectContainer.cs index 3014073..6db2cfb 100644 --- a/Shared/UiPath.Shared.Activities/IObjectContainer.cs +++ b/Shared/UiPath.Shared.Activities/IObjectContainer.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace UiPath.Shared.Activities +namespace Indico.UiPath.Shared.Activities { /// /// A simple container for objects meant to be shared accross the application space. diff --git a/Shared/UiPath.Shared.Activities/InArgumentExtensions.cs b/Shared/UiPath.Shared.Activities/InArgumentExtensions.cs index 22d7de1..836553c 100644 --- a/Shared/UiPath.Shared.Activities/InArgumentExtensions.cs +++ b/Shared/UiPath.Shared.Activities/InArgumentExtensions.cs @@ -1,7 +1,7 @@ using System.Activities; using System.Activities.Expressions; -namespace UiPath.Shared.Activities +namespace Indico.UiPath.Shared.Activities { public static class InArgumentExtensions { diff --git a/Shared/UiPath.Shared.Activities/Indico.UiPath.Shared.Activities.shproj b/Shared/UiPath.Shared.Activities/Indico.UiPath.Shared.Activities.shproj new file mode 100644 index 0000000..f49d07a --- /dev/null +++ b/Shared/UiPath.Shared.Activities/Indico.UiPath.Shared.Activities.shproj @@ -0,0 +1,13 @@ + + + + 4546856d-ea50-45c6-9419-eeeacb5a80aa + 14.0 + + + + + + + + diff --git a/Shared/UiPath.Shared.Activities/Localization/Localization.cs b/Shared/UiPath.Shared.Activities/Localization/Localization.cs index ee8f2cc..f1a2b44 100644 --- a/Shared/UiPath.Shared.Activities/Localization/Localization.cs +++ b/Shared/UiPath.Shared.Activities/Localization/Localization.cs @@ -1,8 +1,8 @@ using System; using System.ComponentModel; -using UiPath.Shared.Localization; +using Indico.UiPath.Shared.Localization; -namespace UiPath.Shared.Activities.Localization +namespace Indico.UiPath.Shared.Activities.Localization { [AttributeUsage(AttributeTargets.Property)] public class LocalizedCategoryAttribute : CategoryAttribute diff --git a/Shared/UiPath.Shared.Activities/ObjectContainer.cs b/Shared/UiPath.Shared.Activities/ObjectContainer.cs index 43c203d..848bb05 100644 --- a/Shared/UiPath.Shared.Activities/ObjectContainer.cs +++ b/Shared/UiPath.Shared.Activities/ObjectContainer.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace UiPath.Shared.Activities +namespace Indico.UiPath.Shared.Activities { /// /// A simple container for objects meant to be shared accross the application space. diff --git a/Shared/UiPath.Shared.Activities/Runtime/AsyncTaskCodeActivity.cs b/Shared/UiPath.Shared.Activities/Runtime/AsyncTaskCodeActivity.cs index bb83a4a..ff135a8 100644 --- a/Shared/UiPath.Shared.Activities/Runtime/AsyncTaskCodeActivity.cs +++ b/Shared/UiPath.Shared.Activities/Runtime/AsyncTaskCodeActivity.cs @@ -4,7 +4,7 @@ using System.Threading; using System.Threading.Tasks; -namespace UiPath.Shared.Activities +namespace Indico.UiPath.Shared.Activities { internal struct AsyncTaskCodeActivityImplementation : IDisposable { diff --git a/Shared/UiPath.Shared.Activities/Runtime/AsyncTaskNativeActivity.cs b/Shared/UiPath.Shared.Activities/Runtime/AsyncTaskNativeActivity.cs index f305eaf..4013a3d 100644 --- a/Shared/UiPath.Shared.Activities/Runtime/AsyncTaskNativeActivity.cs +++ b/Shared/UiPath.Shared.Activities/Runtime/AsyncTaskNativeActivity.cs @@ -3,7 +3,7 @@ using System.Threading; using System.Threading.Tasks; -namespace UiPath.Shared.Activities +namespace Indico.UiPath.Shared.Activities { public abstract class AsyncTaskNativeActivity : NativeActivity { diff --git a/Shared/UiPath.Shared.Activities/Runtime/AsyncTaskNativeImplementation.cs b/Shared/UiPath.Shared.Activities/Runtime/AsyncTaskNativeImplementation.cs index 1406ecc..23baf6b 100644 --- a/Shared/UiPath.Shared.Activities/Runtime/AsyncTaskNativeImplementation.cs +++ b/Shared/UiPath.Shared.Activities/Runtime/AsyncTaskNativeImplementation.cs @@ -3,7 +3,7 @@ using System.Threading; using System.Threading.Tasks; -namespace UiPath.Shared.Activities +namespace Indico.UiPath.Shared.Activities { internal struct AsyncTaskNativeImplementation { @@ -85,7 +85,7 @@ public void Execute(NativeActivityContext context, FuncProvides the standard functionality across activities. public static class ChildActivityExtensions diff --git a/Shared/UiPath.Shared.Activities/Utilities/EnumNameConverter.cs b/Shared/UiPath.Shared.Activities/Utilities/EnumNameConverter.cs index b3e7127..12df4a5 100644 --- a/Shared/UiPath.Shared.Activities/Utilities/EnumNameConverter.cs +++ b/Shared/UiPath.Shared.Activities/Utilities/EnumNameConverter.cs @@ -3,7 +3,7 @@ using System.Globalization; using System.Reflection; -namespace UiPath.Shared.Activities.Utilities +namespace Indico.UiPath.Shared.Activities.Utilities { public class EnumNameConverter : EnumConverter { diff --git a/Shared/UiPath.Shared.Activities/Utilities/HashFunctions.cs b/Shared/UiPath.Shared.Activities/Utilities/HashFunctions.cs index 955060f..8b5d90d 100644 --- a/Shared/UiPath.Shared.Activities/Utilities/HashFunctions.cs +++ b/Shared/UiPath.Shared.Activities/Utilities/HashFunctions.cs @@ -1,7 +1,7 @@ using System.Security.Cryptography; using System.Text; -namespace UiPath.Shared.Activities.Utilities +namespace Indico.UiPath.Shared.Activities.Utilities { public static class HashFunctions {