From 60555c489ca6f658bb84331b4edcc214d670bb8e Mon Sep 17 00:00:00 2001 From: Ben Fidge Date: Wed, 27 Nov 2019 13:00:27 +0700 Subject: [PATCH 1/7] Implement IExtendedEnricherMetadata #2 --- Directory.Build.targets | 2 +- src/ExternalSearch.Providers.PermId.csproj | 8 +++++++- src/PermIdExternalSearchProvider.cs | 15 +++++++++++++-- src/Resources/cluedin.png | Bin 0 -> 27389 bytes 4 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 src/Resources/cluedin.png diff --git a/Directory.Build.targets b/Directory.Build.targets index 28d00bc..4436a60 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -20,7 +20,7 @@ - + diff --git a/src/ExternalSearch.Providers.PermId.csproj b/src/ExternalSearch.Providers.PermId.csproj index 336bc86..a605ebe 100644 --- a/src/ExternalSearch.Providers.PermId.csproj +++ b/src/ExternalSearch.Providers.PermId.csproj @@ -16,6 +16,12 @@ pdbonly + + + + + + @@ -31,7 +37,7 @@ - 2.4.0-alpha0089 + 2.6.0-alpha0003 1.1.0.1 diff --git a/src/PermIdExternalSearchProvider.cs b/src/PermIdExternalSearchProvider.cs index 3c696df..c24826e 100644 --- a/src/PermIdExternalSearchProvider.cs +++ b/src/PermIdExternalSearchProvider.cs @@ -18,17 +18,20 @@ using CluedIn.Core; using CluedIn.Core.Data; using CluedIn.Core.Data.Parts; +using CluedIn.Core.Data.Relational; using CluedIn.ExternalSearch.Filters; using CluedIn.ExternalSearch.Providers.PermId.Models; using CluedIn.Core.ExternalSearch; +using CluedIn.Core.Providers; using CluedIn.Crawling.Helpers; using CluedIn.ExternalSearch.Providers.PermId.Vocabularies; +using EntityType = CluedIn.Core.Data.EntityType; namespace CluedIn.ExternalSearch.Providers.PermId { /// The permid graph external search provider. /// - public class PermIdExternalSearchProvider : ExternalSearchProviderBase + public class PermIdExternalSearchProvider : ExternalSearchProviderBase, IExtendedEnricherMetadata { /********************************************************************************************************** * CONSTRUCTORS @@ -351,5 +354,13 @@ private void PopulatePersonMetadata(IEntityMetadata metadata, AssociatedPerson p if (!string.IsNullOrEmpty(person.PersonUrl?.FirstOrDefault())) metadata.Uri = new Uri(string.Format("https://permid.org/1-{0}", person.PersonUrl.First())); } + + public string Icon { get; } = "Resources.cluedin.png"; + public string Domain { get; } = "To be confirmed"; + public string About { get; } = "A test Enricher used to work with known data during acceptance tests"; + public AuthMethods AuthMethods { get; } = null; + public IEnumerable Properties { get; } = null; + public Guide Guide { get; } = null; + public IntegrationType Type { get; } = IntegrationType.Cloud; } -} \ No newline at end of file +} diff --git a/src/Resources/cluedin.png b/src/Resources/cluedin.png new file mode 100644 index 0000000000000000000000000000000000000000..ff933309357f09dc631e8912fd873f417b2f2719 GIT binary patch literal 27389 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 Date: Wed, 27 Nov 2019 14:06:41 +0700 Subject: [PATCH 2/7] CI Fix --- src/ExternalSearch.Providers.PermId.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ExternalSearch.Providers.PermId.csproj b/src/ExternalSearch.Providers.PermId.csproj index a605ebe..9222c10 100644 --- a/src/ExternalSearch.Providers.PermId.csproj +++ b/src/ExternalSearch.Providers.PermId.csproj @@ -12,6 +12,7 @@ full + x64 pdbonly From 972bfe7c279d89bdb40d0709c62a5f00e940e506 Mon Sep 17 00:00:00 2001 From: Lovro Biljeskovic Date: Wed, 27 Nov 2019 11:36:16 +0100 Subject: [PATCH 3/7] added new icon, about and domain values to external search provider --- src/ExternalSearch.Providers.PermId.csproj | 4 ++-- src/PermIdExternalSearchProvider.cs | 6 +++--- src/Resources/permid.jpg | Bin 0 -> 8150 bytes 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 src/Resources/permid.jpg diff --git a/src/ExternalSearch.Providers.PermId.csproj b/src/ExternalSearch.Providers.PermId.csproj index 9222c10..5332d64 100644 --- a/src/ExternalSearch.Providers.PermId.csproj +++ b/src/ExternalSearch.Providers.PermId.csproj @@ -18,10 +18,10 @@ pdbonly - + - + diff --git a/src/PermIdExternalSearchProvider.cs b/src/PermIdExternalSearchProvider.cs index c24826e..62bb2db 100644 --- a/src/PermIdExternalSearchProvider.cs +++ b/src/PermIdExternalSearchProvider.cs @@ -355,9 +355,9 @@ private void PopulatePersonMetadata(IEntityMetadata metadata, AssociatedPerson p metadata.Uri = new Uri(string.Format("https://permid.org/1-{0}", person.PersonUrl.First())); } - public string Icon { get; } = "Resources.cluedin.png"; - public string Domain { get; } = "To be confirmed"; - public string About { get; } = "A test Enricher used to work with known data during acceptance tests"; + public string Icon { get; } = "Resources.permid.jpg"; + public string Domain { get; } = "https://permid.org/"; + public string About { get; } = "PermID is enricher using permanent and universal identifiers where underlying attributes capture the context of the identity they each represent"; public AuthMethods AuthMethods { get; } = null; public IEnumerable Properties { get; } = null; public Guide Guide { get; } = null; diff --git a/src/Resources/permid.jpg b/src/Resources/permid.jpg new file mode 100644 index 0000000000000000000000000000000000000000..846ea86f7e68c9546d27a43b63fba8026171165f GIT binary patch literal 8150 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 literal 0 HcmV?d00001 From a1228b8e79df51658cd318f46b9bd73a444866d0 Mon Sep 17 00:00:00 2001 From: Ben Fidge Date: Thu, 28 Nov 2019 11:42:37 +0700 Subject: [PATCH 4/7] Fixed dual reference to CluedIn.ExternalSearch in csproj --- src/ExternalSearch.Providers.PermId.csproj | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/ExternalSearch.Providers.PermId.csproj b/src/ExternalSearch.Providers.PermId.csproj index 9222c10..ea86626 100644 --- a/src/ExternalSearch.Providers.PermId.csproj +++ b/src/ExternalSearch.Providers.PermId.csproj @@ -24,7 +24,7 @@ - + @@ -37,10 +37,7 @@ - - 2.6.0-alpha0003 - - + 1.1.0.1 From 7ed3a867363bfe00d6fc5647069b42db7de46c6e Mon Sep 17 00:00:00 2001 From: BenFidge Date: Mon, 2 Dec 2019 11:17:35 +0700 Subject: [PATCH 5/7] Create 0.1.0-release-notes.md --- docs/0.1.0-release-notes.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 docs/0.1.0-release-notes.md diff --git a/docs/0.1.0-release-notes.md b/docs/0.1.0-release-notes.md new file mode 100644 index 0000000..d12af52 --- /dev/null +++ b/docs/0.1.0-release-notes.md @@ -0,0 +1,2 @@ +### Features +Initial release From 04e184237e6e3c6eafd6195625c8b286b79b22af Mon Sep 17 00:00:00 2001 From: Ben Fidge Date: Tue, 10 Dec 2019 13:24:45 +0700 Subject: [PATCH 6/7] Updated to Core 2.5.2 --- src/ExternalSearch.Providers.PermId.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ExternalSearch.Providers.PermId.csproj b/src/ExternalSearch.Providers.PermId.csproj index 2f9ad1c..70a6ee6 100644 --- a/src/ExternalSearch.Providers.PermId.csproj +++ b/src/ExternalSearch.Providers.PermId.csproj @@ -24,7 +24,7 @@ - + From 937f0c049b0ba2f1f8acbaa4b681dd179c75dba8 Mon Sep 17 00:00:00 2001 From: BenFidge Date: Wed, 11 Dec 2019 14:31:55 +0700 Subject: [PATCH 7/7] Update Directory.Build.targets --- Directory.Build.targets | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 4436a60..c92ec76 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -19,8 +19,4 @@ - - - -