Skip to content

Commit 38a1cda

Browse files
Miller-KyleMiller-Kyle
authored
Renamed Microsoft Energy Data Services to Microsoft Azure Data Manager for Energy (#22)
1 parent c5d42a1 commit 38a1cda

15 files changed

Lines changed: 66 additions & 66 deletions

MicrosoftEnergyDataServices/MicrosoftEnergyDataServices.sln renamed to MicrosoftAzureDataManagerForEnergy/MicrosoftAzureDataManagerForEnergy.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.32802.399
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{4DF76451-A46A-4C0B-BE03-459FAAFA07E6}") = "MicrosoftEnergyDataServices", "MicrosoftEnergyDataServices\MicrosoftEnergyDataServices.mproj", "{5857F243-3226-4A1B-9C66-C39614EA9018}"
6+
Project("{4DF76451-A46A-4C0B-BE03-459FAAFA07E6}") = "MicrosoftAzureDataManagerForEnergy", "MicrosoftAzureDataManagerForEnergy\MicrosoftAzureDataManagerForEnergy.mproj", "{5857F243-3226-4A1B-9C66-C39614EA9018}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution

MicrosoftEnergyDataServices/MicrosoftEnergyDataServices/MicrosoftEnergyDataServices.mproj renamed to MicrosoftAzureDataManagerForEnergy/MicrosoftAzureDataManagerForEnergy/MicrosoftAzureDataManagerForEnergy.mproj

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<SuppressCellErrors>False</SuppressCellErrors>
2020
<MaxRows>infinite</MaxRows>
2121
<ExtensionProject>Yes</ExtensionProject>
22-
<Name>MicrosoftEnergyDataServices</Name>
22+
<Name>MicrosoftAzureDataManagerForEnergy</Name>
2323
<ThrowOnFoldingFailure>False</ThrowOnFoldingFailure>
2424
</PropertyGroup>
2525
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -38,37 +38,37 @@
3838
<Reference Include="System.Xml" />
3939
</ItemGroup>
4040
<ItemGroup>
41-
<Compile Include="MicrosoftEnergyDataServices.pq">
41+
<Compile Include="MicrosoftAzureDataManagerForEnergy.pq">
4242
<SubType>Code</SubType>
4343
</Compile>
44-
<Compile Include="MicrosoftEnergyDataServices16.png">
44+
<Compile Include="MicrosoftAzureDataManagerForEnergy16.png">
4545
<SubType>Code</SubType>
4646
</Compile>
47-
<Compile Include="MicrosoftEnergyDataServices20.png">
47+
<Compile Include="MicrosoftAzureDataManagerForEnergy20.png">
4848
<SubType>Code</SubType>
4949
</Compile>
50-
<Compile Include="MicrosoftEnergyDataServices24.png">
50+
<Compile Include="MicrosoftAzureDataManagerForEnergy24.png">
5151
<SubType>Code</SubType>
5252
</Compile>
53-
<Compile Include="MicrosoftEnergyDataServices32.png">
53+
<Compile Include="MicrosoftAzureDataManagerForEnergy32.png">
5454
<SubType>Code</SubType>
5555
</Compile>
56-
<Compile Include="MicrosoftEnergyDataServices40.png">
56+
<Compile Include="MicrosoftAzureDataManagerForEnergy40.png">
5757
<SubType>Code</SubType>
5858
</Compile>
59-
<Compile Include="MicrosoftEnergyDataServices48.png">
59+
<Compile Include="MicrosoftAzureDataManagerForEnergy48.png">
6060
<SubType>Code</SubType>
6161
</Compile>
62-
<Compile Include="MicrosoftEnergyDataServices64.png">
62+
<Compile Include="MicrosoftAzureDataManagerForEnergy64.png">
6363
<SubType>Code</SubType>
6464
</Compile>
65-
<Compile Include="MicrosoftEnergyDataServices80.png">
65+
<Compile Include="MicrosoftAzureDataManagerForEnergy80.png">
6666
<SubType>Code</SubType>
6767
</Compile>
6868
<Compile Include="resources.resx">
6969
<SubType>Code</SubType>
7070
</Compile>
71-
<Content Include="MicrosoftEnergyDataServices.query.pq">
71+
<Content Include="MicrosoftAzureDataManagerForEnergy.query.pq">
7272
<SubType>Code</SubType>
7373
</Content>
7474
</ItemGroup>

MicrosoftEnergyDataServices/MicrosoftEnergyDataServices/MicrosoftEnergyDataServices.pq renamed to MicrosoftAzureDataManagerForEnergy/MicrosoftAzureDataManagerForEnergy/MicrosoftAzureDataManagerForEnergy.pq

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
// Licensed under the MIT License.
33

44
[Version="1.0.0"]
5-
section MicrosoftEnergyDataServices;
5+
section MicrosoftAzureDataManagerForEnergy;
66

77
redirectUri = "https://oauth.powerbi.com/views/oauthredirect.html"; // Must be a platform that supports PKCE (Single Page Application)
88
logoutUri = "https://login.microsoftonline.com/logout.srf";
99
pageSize = 100;
1010

11-
[DataSource.Kind="MicrosoftEnergyDataServices", Publish="MicrosoftEnergyDataServices.Publish"]
12-
shared MicrosoftEnergyDataServices.Search = Value.ReplaceType(MicrosoftEnergyDataServicesImpl, MicrosoftEnergyDataServicesType);
11+
[DataSource.Kind="MicrosoftAzureDataManagerForEnergy", Publish="MicrosoftAzureDataManagerForEnergy.Publish"]
12+
shared MicrosoftAzureDataManagerForEnergy.Search = Value.ReplaceType(MicrosoftAzureDataManagerForEnergyImpl, MicrosoftAzureDataManagerForEnergyType);
1313

14-
MicrosoftEnergyDataServicesType = type function (
14+
MicrosoftAzureDataManagerForEnergyType = type function (
1515
clientId as (type text meta [
1616
Documentation.FieldCaption = Extension.LoadString("clientIdFieldCaption"),
1717
Documentation.FieldDescription = Extension.LoadString("clientIdFieldDescription"),
@@ -57,12 +57,12 @@ MicrosoftEnergyDataServicesType = type function (
5757
Documentation.LongDescription = Extension.LoadString("documentationLongDescription"),
5858
Documentation.Examples = {[
5959
Description = Extension.LoadString("exampleDescription"),
60-
Code = "MicrosoftEnergyDataServices.Search(""fb82bc98-a537-4c2b-a4ed-cf7c53eed5f9"", ""4b12b551-b235-46b3-9f79-6a61adc75b6a"", ""platform4321"", ""platform4321-opendes"", ""osdu:wks:master-data--Well:1.0.0"", ""*"", 2, null)",
60+
Code = "MicrosoftAzureDataManagerForEnergy.Search(""fb82bc98-a537-4c2b-a4ed-cf7c53eed5f9"", ""4b12b551-b235-46b3-9f79-6a61adc75b6a"", ""platform4321"", ""platform4321-opendes"", ""osdu:wks:master-data--Well:1.0.0"", ""*"", 2, null)",
6161
Result = Extension.LoadString("exampleResult")
6262
]}
6363
];
6464

65-
MicrosoftEnergyDataServicesImpl = (clientId as text,
65+
MicrosoftAzureDataManagerForEnergyImpl = (clientId as text,
6666
tenantId as text,
6767
serviceName as text,
6868
dataPartition as text,
@@ -179,7 +179,7 @@ RetrievedAllPages = (previousPage, optional limit as number) =>
179179
else
180180
if collectedItems = totalItems then // Retrieved all records, regardless of user's limit
181181
true
182-
else if not (limit = null) and collectedItems >= limit then // User specified limit and we retrieved that many records. Using >= comparison in case user specified 0 limit - Microsoft Energy Data Services will default to 10 in that case
182+
else if not (limit = null) and collectedItems >= limit then // User specified limit and we retrieved that many records. Using >= comparison in case user specified 0 limit - Azure Data Manager for Energy will default to 10 in that case
183183
true
184184
else // We have more records to retrieve beause we haven't retrieved them all yet, or we haven't reached the user's optional limit
185185
false
@@ -200,7 +200,7 @@ AdjustPageSizeDependingOnUsersLimit = (runningCountOfRetrievedRecords as number,
200200
in
201201
adjustedLimit;
202202

203-
MicrosoftEnergyDataServices = [
203+
MicrosoftAzureDataManagerForEnergy = [
204204
TestConnection = (dataSourcePath) =>
205205
let
206206
json = Json.Document(dataSourcePath),
@@ -211,7 +211,7 @@ MicrosoftEnergyDataServices = [
211211
kind = json[kind],
212212
query = json[query]
213213
in
214-
{ "MicrosoftEnergyDataServices.Search", clientId, tenantId, serviceName, dataPartition, kind, query },
214+
{ "MicrosoftAzureDataManagerForEnergy.Search", clientId, tenantId, serviceName, dataPartition, kind, query },
215215
Authentication = [
216216
OAuth = [
217217
StartLogin=StartLogin,
@@ -223,18 +223,18 @@ MicrosoftEnergyDataServices = [
223223
Label = Extension.LoadString("dataSourceLabel")
224224
];
225225

226-
MicrosoftEnergyDataServices.Publish = [
226+
MicrosoftAzureDataManagerForEnergy.Publish = [
227227
Beta = true,
228228
Category = "Azure",
229229
ButtonText = { Extension.LoadString("buttonTitle"), Extension.LoadString("buttonHelp") },
230230
LearnMoreUrl = "https://learn.microsoft.com/azure/energy-data-services/",
231-
SourceImage = MicrosoftEnergyDataServices.Icons,
232-
SourceTypeImage = MicrosoftEnergyDataServices.Icons
231+
SourceImage = MicrosoftAzureDataManagerForEnergy.Icons,
232+
SourceTypeImage = MicrosoftAzureDataManagerForEnergy.Icons
233233
];
234234

235-
MicrosoftEnergyDataServices.Icons = [
236-
Icon16 = { Extension.Contents("MicrosoftEnergyDataServices16.png"), Extension.Contents("MicrosoftEnergyDataServices20.png"), Extension.Contents("MicrosoftEnergyDataServices24.png"), Extension.Contents("MicrosoftEnergyDataServices32.png") },
237-
Icon32 = { Extension.Contents("MicrosoftEnergyDataServices32.png"), Extension.Contents("MicrosoftEnergyDataServices40.png"), Extension.Contents("MicrosoftEnergyDataServices48.png"), Extension.Contents("MicrosoftEnergyDataServices64.png") }
235+
MicrosoftAzureDataManagerForEnergy.Icons = [
236+
Icon16 = { Extension.Contents("MicrosoftAzureDataManagerForEnergy16.png"), Extension.Contents("MicrosoftAzureDataManagerForEnergy20.png"), Extension.Contents("MicrosoftAzureDataManagerForEnergy24.png"), Extension.Contents("MicrosoftAzureDataManagerForEnergy32.png") },
237+
Icon32 = { Extension.Contents("MicrosoftAzureDataManagerForEnergy32.png"), Extension.Contents("MicrosoftAzureDataManagerForEnergy40.png"), Extension.Contents("MicrosoftAzureDataManagerForEnergy48.png"), Extension.Contents("MicrosoftAzureDataManagerForEnergy64.png") }
238238
];
239239

240240
Base64UrlEncode = (toConvert as binary) as text =>

MicrosoftEnergyDataServices/MicrosoftEnergyDataServices/MicrosoftEnergyDataServices.query.pq renamed to MicrosoftAzureDataManagerForEnergy/MicrosoftAzureDataManagerForEnergy/MicrosoftAzureDataManagerForEnergy.query.pq

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,32 @@
22
// Licensed under the MIT License.
33

44
[Version="1.0.0"]
5-
section MicrosoftEnergyDataServicesTests;
5+
section MicrosoftAzureDataManagerForEnergyTests;
66

77
// Tests must be run against an instance that's completed a TNO data load: https://github.com/Azure/osdu-data-load-tno
88
clientId = "<client id>";
99
tenantId = "<tenant id>";
10-
instanceName = "<Microsoft Energy Data Services instance name>";
10+
instanceName = "<Microsoft Azure Data Manager for Energy instance name>";
1111
datapatition = "<data patition ID>";
1212
kind = "osdu:wks:master-data--Well:1.0.0";
1313
query = "*";
1414

15-
shared MicrosoftEnergyDataServices.Test =
15+
shared MicrosoftAzureDataManagerForEnergy.Test =
1616
[
1717
// Fact(<Name of the Test>, <Expected Value>, <Actual Value>)
1818
facts =
1919
{
2020
Fact("Check that total record count is calculated when there is no limit",
2121
4947,
22-
GetTotalCount(MicrosoftEnergyDataServices.Search(clientId,
22+
GetTotalCount(MicrosoftAzureDataManagerForEnergy.Search(clientId,
2323
tenantId,
2424
instanceName,
2525
datapatition,
2626
kind,
2727
query))),
2828
Fact("Check that total record count is calculated there is a limit",
2929
4947,
30-
GetTotalCount(MicrosoftEnergyDataServices.Search(clientId,
30+
GetTotalCount(MicrosoftAzureDataManagerForEnergy.Search(clientId,
3131
tenantId,
3232
instanceName,
3333
datapatition,
@@ -36,23 +36,23 @@ shared MicrosoftEnergyDataServices.Test =
3636
204))),
3737
Fact("Check that correct number of records are retrieved when there is no limit",
3838
4947,
39-
GetNumberOfRows(MicrosoftEnergyDataServices.Search(clientId,
39+
GetNumberOfRows(MicrosoftAzureDataManagerForEnergy.Search(clientId,
4040
tenantId,
4141
instanceName,
4242
datapatition,
4343
kind,
4444
query))),
4545
Fact("Check that correct number of records are retrieved when there is a query",
4646
4947,
47-
GetNumberOfRows(MicrosoftEnergyDataServices.Search(clientId,
47+
GetNumberOfRows(MicrosoftAzureDataManagerForEnergy.Search(clientId,
4848
tenantId,
4949
instanceName,
5050
datapatition,
5151
kind,
5252
"type:master-data--Well"))),
5353
Fact("Check that correct number of records are retrieved when there is a query and a limit",
5454
2,
55-
GetNumberOfRows(MicrosoftEnergyDataServices.Search(clientId,
55+
GetNumberOfRows(MicrosoftAzureDataManagerForEnergy.Search(clientId,
5656
tenantId,
5757
instanceName,
5858
datapatition,
@@ -61,7 +61,7 @@ shared MicrosoftEnergyDataServices.Test =
6161
2))),
6262
Fact("Check that correct number of records are retrieved when the limit is greater than the service's max page size",
6363
1500,
64-
GetNumberOfRows(MicrosoftEnergyDataServices.Search(clientId,
64+
GetNumberOfRows(MicrosoftAzureDataManagerForEnergy.Search(clientId,
6565
tenantId,
6666
instanceName,
6767
datapatition,
@@ -70,7 +70,7 @@ shared MicrosoftEnergyDataServices.Test =
7070
1500))),
7171
Fact("Check that correct number of records are retrieved when the limit equals the service's max page size",
7272
1000,
73-
GetNumberOfRows(MicrosoftEnergyDataServices.Search(clientId,
73+
GetNumberOfRows(MicrosoftAzureDataManagerForEnergy.Search(clientId,
7474
tenantId,
7575
instanceName,
7676
datapatition,
@@ -79,7 +79,7 @@ shared MicrosoftEnergyDataServices.Test =
7979
1000))),
8080
Fact("Check that correct number of records are retrieved when the limit is equal to the connectors's page size",
8181
100,
82-
GetNumberOfRows(MicrosoftEnergyDataServices.Search(clientId,
82+
GetNumberOfRows(MicrosoftAzureDataManagerForEnergy.Search(clientId,
8383
tenantId,
8484
instanceName,
8585
datapatition,
@@ -88,7 +88,7 @@ shared MicrosoftEnergyDataServices.Test =
8888
100))),
8989
Fact("Check that correct number of records are retrieved when the limit is less than the connectors's page size",
9090
10,
91-
GetNumberOfRows(MicrosoftEnergyDataServices.Search(clientId,
91+
GetNumberOfRows(MicrosoftAzureDataManagerForEnergy.Search(clientId,
9292
tenantId,
9393
instanceName,
9494
datapatition,
@@ -97,7 +97,7 @@ shared MicrosoftEnergyDataServices.Test =
9797
10))),
9898
Fact("Check that correct number of records are retrieved when the limit is equal to the total count",
9999
4947,
100-
GetNumberOfRows(MicrosoftEnergyDataServices.Search(clientId,
100+
GetNumberOfRows(MicrosoftAzureDataManagerForEnergy.Search(clientId,
101101
tenantId,
102102
instanceName,
103103
datapatition,
@@ -106,16 +106,16 @@ shared MicrosoftEnergyDataServices.Test =
106106
4947))),
107107
Fact("Check that correct number of records are retrieved when the limit is greater than the total count",
108108
4947,
109-
GetNumberOfRows(MicrosoftEnergyDataServices.Search(clientId,
109+
GetNumberOfRows(MicrosoftAzureDataManagerForEnergy.Search(clientId,
110110
tenantId,
111111
instanceName,
112112
datapatition,
113113
kind,
114114
query,
115115
5000))),
116116
Fact("Check that correct number of records are retrieved when the limit is 0",
117-
10, // Microsoft Energy Data Services will default to 10 if the limit is 0
118-
GetNumberOfRows(MicrosoftEnergyDataServices.Search(clientId,
117+
10, // Microsoft Azure Data Manager for Energy will default to 10 if the limit is 0
118+
GetNumberOfRows(MicrosoftAzureDataManagerForEnergy.Search(clientId,
119119
tenantId,
120120
instanceName,
121121
datapatition,
@@ -124,7 +124,7 @@ shared MicrosoftEnergyDataServices.Test =
124124
0))),
125125
Fact("Check that a partial final page, where the difference in limit and page size is greater than the page size, retrieves the correct number of records",
126126
204,
127-
GetNumberOfRows(MicrosoftEnergyDataServices.Search(clientId,
127+
GetNumberOfRows(MicrosoftAzureDataManagerForEnergy.Search(clientId,
128128
tenantId,
129129
instanceName,
130130
datapatition,
@@ -133,7 +133,7 @@ shared MicrosoftEnergyDataServices.Test =
133133
204))),
134134
Fact("Check that a partial final page, where the difference in limit and page size is less than the page size, retrieves the correct number of records",
135135
150,
136-
GetNumberOfRows(MicrosoftEnergyDataServices.Search(clientId,
136+
GetNumberOfRows(MicrosoftAzureDataManagerForEnergy.Search(clientId,
137137
tenantId,
138138
instanceName,
139139
datapatition,
@@ -142,15 +142,15 @@ shared MicrosoftEnergyDataServices.Test =
142142
150))),
143143
Fact("Check that all paged records are unique",
144144
true,
145-
List.IsDistinct(GetRecordIds(MicrosoftEnergyDataServices.Search(clientId,
145+
List.IsDistinct(GetRecordIds(MicrosoftAzureDataManagerForEnergy.Search(clientId,
146146
tenantId,
147147
instanceName,
148148
datapatition,
149149
kind,
150150
query)))),
151151
Fact("Check that all paged records are unique when there is a limit",
152152
true,
153-
List.IsDistinct(GetRecordIds(MicrosoftEnergyDataServices.Search(clientId,
153+
List.IsDistinct(GetRecordIds(MicrosoftAzureDataManagerForEnergy.Search(clientId,
154154
tenantId,
155155
instanceName,
156156
datapatition,
@@ -159,7 +159,7 @@ shared MicrosoftEnergyDataServices.Test =
159159
150)))),
160160
Fact("Check that the number of returnedFields is correct",
161161
1,
162-
GetNumberOfRecordProperties(MicrosoftEnergyDataServices.Search(clientId,
162+
GetNumberOfRecordProperties(MicrosoftAzureDataManagerForEnergy.Search(clientId,
163163
tenantId,
164164
instanceName,
165165
datapatition,
@@ -169,7 +169,7 @@ shared MicrosoftEnergyDataServices.Test =
169169
"""id"""))),
170170
Fact("Check that the record's fields are projected to returnedFields",
171171
true,
172-
FirstRecordHasField(MicrosoftEnergyDataServices.Search(clientId,
172+
FirstRecordHasField(MicrosoftAzureDataManagerForEnergy.Search(clientId,
173173
tenantId,
174174
instanceName,
175175
datapatition,

MicrosoftEnergyDataServices/MicrosoftEnergyDataServices/MicrosoftEnergyDataServices16.png renamed to MicrosoftAzureDataManagerForEnergy/MicrosoftAzureDataManagerForEnergy/MicrosoftAzureDataManagerForEnergy16.png

File renamed without changes.

MicrosoftEnergyDataServices/MicrosoftEnergyDataServices/MicrosoftEnergyDataServices20.png renamed to MicrosoftAzureDataManagerForEnergy/MicrosoftAzureDataManagerForEnergy/MicrosoftAzureDataManagerForEnergy20.png

File renamed without changes.

MicrosoftEnergyDataServices/MicrosoftEnergyDataServices/MicrosoftEnergyDataServices24.png renamed to MicrosoftAzureDataManagerForEnergy/MicrosoftAzureDataManagerForEnergy/MicrosoftAzureDataManagerForEnergy24.png

File renamed without changes.

MicrosoftEnergyDataServices/MicrosoftEnergyDataServices/MicrosoftEnergyDataServices32.png renamed to MicrosoftAzureDataManagerForEnergy/MicrosoftAzureDataManagerForEnergy/MicrosoftAzureDataManagerForEnergy32.png

File renamed without changes.

MicrosoftEnergyDataServices/MicrosoftEnergyDataServices/MicrosoftEnergyDataServices40.png renamed to MicrosoftAzureDataManagerForEnergy/MicrosoftAzureDataManagerForEnergy/MicrosoftAzureDataManagerForEnergy40.png

File renamed without changes.

MicrosoftEnergyDataServices/MicrosoftEnergyDataServices/MicrosoftEnergyDataServices48.png renamed to MicrosoftAzureDataManagerForEnergy/MicrosoftAzureDataManagerForEnergy/MicrosoftAzureDataManagerForEnergy48.png

File renamed without changes.

0 commit comments

Comments
 (0)