Merge pull request #13 from pbi-tools/Release/1.1

Release 1.1
pbi-tools · Sep 6, 2022 · d4cc449 · d4cc449
2 parents 335be3f + b0f8247
commit d4cc449
Show file tree

Hide file tree

Showing 41 changed files with 326 additions and 114 deletions.
diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
@@ -4,7 +4,7 @@ name: Deploy-DEV
 on:
   pull_request:
     branches:
-      - 'release/*'
+      - 'Release/*'
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: Development
     container:
-      image: ghcr.io/pbi-tools/pbi-tools-core:1.0.0-rc.2_20220525
+      image: ghcr.io/pbi-tools/pbi-tools-core:1.0.0-rc.2_preview.4
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -46,3 +46,10 @@ jobs:
           /app/pbi-tools/pbi-tools.core deploy . "$PROFILE"
         env:
           PBI_CLIENT_SECRET: ${{ secrets.PBI_CLIENT_SECRET }}
+
+      - name: Store refresh summary as artifact
+        uses: actions/upload-artifact@v3
+        if: ${{ github.event.inputs.whatIf != 'true' }}
+        with:
+          name: Refresh Summary
+          path: refresh_stats.csv
diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: Production
     container:
-      image: ghcr.io/pbi-tools/pbi-tools-core:1.0.0-rc.2_20220525
+      image: ghcr.io/pbi-tools/pbi-tools-core:1.0.0-rc.2_preview.4
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it

diff --git a/.github/workflows/deploy-uat.yml b/.github/workflows/deploy-uat.yml
@@ -4,7 +4,7 @@ name: Deploy-UAT
 on:
   push:
     branches:
-      - 'release/*'
+      - 'Release/*'
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: UAT
     container:
-      image: ghcr.io/pbi-tools/pbi-tools-core:1.0.0-rc.2_20220525
+      image: ghcr.io/pbi-tools/pbi-tools-core:1.0.0-rc.2_preview.4
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it

diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@ dataTransforms.json
 
 *.pbix
 *.pbit
-*.bim
+*.bim
+*.csv
diff --git a/.pbixproj.json b/.pbixproj.json
@@ -16,36 +16,63 @@
       },
       "options": {
         "refresh": {
+          "enabled": true,
           "skipNewDataset": true,
           "method": "XMLA",
-          "type": "Full"
+          "type": "Full",
+          "tracing": {
+            "enabled": true,
+            "logEvents": {
+              "filter": [
+                "*|TabularRefresh|Partition",
+                "*|ReadData|Partition"
+              ]
+            },
+            "summary": {
+              "events": [
+                "TabularRefresh",
+                "Process",
+                "ReadData",
+                "ExecuteSql"
+              ],
+              "objectTypes": [
+                "Partition"
+              ],
+              "outPath": "refresh_stats.csv",
+              "console": true
+            }
+          }
         },
         "dataset": {
-          "replaceParameters": true
+          "replaceParameters": true,
+          "deployEmbeddedReport": true
         }
       },
       "parameters": {
-        "Version": "1.0.0",
-        "GH-Branch": "%GITHUB_REF_NAME%",
-        "GH-RunId": "%GITHUB_RUN_ID%",
-        "GH-SHA": "%GITHUB_SHA%"
+        "[Version]": "1.1.0",
+        "[Environment]": "{{ENVIRONMENT}}",
+        "[PBITOOLS_VERSION]": "{{PBITOOLS_VERSION}}",
+        "[GH-Branch]": "%GITHUB_REF_NAME%",
+        "[GH-RunId]": "%GITHUB_RUN_ID%",
+        "[GH-SHA]": "%GITHUB_SHA%",
+        "[FilterDate]": null
       },
       "environments": {
         "Development": {
           "workspace": "Datasets [DEV]",
           "displayName": "{{PBIXPROJ_FOLDER}} [DEV]",
-          "refresh": true
+          "refresh": {}
         },
         "UAT": {
           "workspace": "Datasets [PROD]",
           "displayName": "{{PBIXPROJ_FOLDER}} [UAT]",
-          "refresh": true
+          "refresh": {}
         },
         "Production": {
           "workspace": "Datasets [PROD]",
-          "refresh": true
+          "refresh": {}
         }
       }
     }
   }
-}
+}
diff --git a/Contoso Sales/.pbixproj.json b/Contoso Sales/.pbixproj.json
@@ -1,5 +1,16 @@
 {
-  "version": "0.11",
+  "version": "0.12",
   "created": "2022-05-24T11:48:58.4881844+01:00",
-  "lastModified": "2022-05-25T22:20:04.3043579+01:00"
+  "lastModified": "2022-07-03T18:18:05.2309008+01:00",
+  "settings": {
+    "model": {
+      "serializationMode": "Default",
+      "annotations": {
+        "exclude": [
+          "PBI_NavigationStepName",
+          "PBI_ResultType"
+        ]
+      }
+    }
+  }
 }
diff --git a/Contoso Sales/Model/cultures/en-US.json b/Contoso Sales/Model/cultures/en-US.json
@@ -12,20 +12,30 @@
     "model": {
       "name": "Model",
       "tables": [
+        {
+          "name": "Metric",
+          "translatedCaption": "Metric",
+          "columns": [
+            {
+              "name": "Metric",
+              "translatedCaption": "Metric"
+            }
+          ]
+        },
         {
           "name": "Sales",
           "measures": [
-            {
-              "name": "Total Cost",
-              "translatedCaption": "Total Cost"
-            },
             {
               "name": "Margin",
               "translatedCaption": "Margin"
             },
             {
               "name": "Sales Quantity",
               "translatedCaption": "Sales Quantity"
+            },
+            {
+              "name": "Total Cost",
+              "translatedCaption": "Total Cost"
             }
           ]
         },
@@ -38,16 +48,6 @@
               "translatedCaption": "Time Calc"
             }
           ]
-        },
-        {
-          "name": "Metric",
-          "translatedCaption": "Metric",
-          "columns": [
-            {
-              "name": "Metric",
-              "translatedCaption": "Metric"
-            }
-          ]
         }
       ]
     }

diff --git a/Contoso Sales/Model/database.json b/Contoso Sales/Model/database.json
@@ -58,28 +58,55 @@
     ],
     "expressions": [
       {
-        "name": "SourceUrl",
-        "kind": "m"
+        "name": "[SourceUrl]",
+        "kind": "m",
+        "queryGroup": "Parameters"
       },
       {
-        "name": "Version",
-        "kind": "m"
+        "name": "[Version]",
+        "kind": "m",
+        "queryGroup": "Parameters"
       },
       {
-        "name": "GH-SHA",
-        "kind": "m"
+        "name": "[GH-SHA]",
+        "kind": "m",
+        "queryGroup": "Parameters"
       },
       {
-        "name": "GH-RunId",
-        "kind": "m"
+        "name": "[GH-RunId]",
+        "kind": "m",
+        "queryGroup": "Parameters"
       },
       {
-        "name": "Environment",
-        "kind": "m"
+        "name": "[Environment]",
+        "kind": "m",
+        "queryGroup": "Parameters"
       },
       {
-        "name": "GH-Branch",
-        "kind": "m"
+        "name": "[GH-Branch]",
+        "kind": "m",
+        "queryGroup": "Parameters"
+      },
+      {
+        "name": "[FilterDate]",
+        "kind": "m",
+        "queryGroup": "Parameters"
+      },
+      {
+        "name": "[PBITOOLS_VERSION]",
+        "kind": "m",
+        "queryGroup": "Parameters"
+      }
+    ],
+    "queryGroups": [
+      {
+        "folder": "Parameters",
+        "annotations": [
+          {
+            "name": "PBI_QueryGroupOrder",
+            "value": "0"
+          }
+        ]
       }
     ],
     "annotations": [
@@ -89,11 +116,11 @@
       },
       {
         "name": "PBIDesktopVersion",
-        "value": "2.105.923.0 (22.05)"
+        "value": "2.106.883.0 (22.06)"
       },
       {
         "name": "PBI_QueryOrder",
-        "value": "[\"Product\",\"Date\",\"Customer\",\"Promotion\",\"Sales\",\"Store\",\"SourceUrl\",\"Info\",\"Version\",\"GH-SHA\",\"GH-RunId\",\"Environment\",\"GH-Branch\"]"
+        "value": "[\"Product\",\"Date\",\"Customer\",\"Promotion\",\"Sales\",\"Store\",\"[SourceUrl]\",\"Info\",\"[Version]\",\"[GH-SHA]\",\"[GH-RunId]\",\"[Environment]\",\"[GH-Branch]\",\"[FilterDate]\",\"[PBITOOLS_VERSION]\"]"
       },
       {
         "name": "__TEdtr",

diff --git a/Contoso Sales/Model/queries/Customer.m b/Contoso Sales/Model/queries/Customer.m
@@ -1,5 +1,5 @@
 let
-    Source = Web.Contents(SourceUrl & "Customer.csv"),
+    Source = Web.Contents(#"[SourceUrl]" & "Customer.csv"),
     Csv = Csv.Document(Source, [QuoteStyle=QuoteStyle.Csv]),
     #"Promoted Headers" = Table.PromoteHeaders(Csv, [PromoteAllScalars=true]),
     #"Changed Type" = Table.TransformColumnTypes(#"Promoted Headers",{{"CustomerKey", Int64.Type}, {"Customer Code", type text}, {"Title", type text}, {"Name", type text}, {"Marital Status", type text}, {"Gender", type text}, {"Yearly Income", type number}, {"Total Children", Int64.Type}, {"Children At Home", Int64.Type}, {"Education", type text}, {"Occupation", type text}, {"House Ownership", type text}, {"Cars Owned", Int64.Type}, {"Continent", type text}, {"City", type text}, {"State", type text}, {"CountryRegion", type text}, {"Address Line 1", type text}, {"Address Line 2", type text}, {"Phone", type text}, {"Customer Type", type text}, {"Company Name", type text}}),

diff --git a/Contoso Sales/Model/queries/Date.m b/Contoso Sales/Model/queries/Date.m
@@ -1,5 +1,5 @@
 let
-    Source = Web.Contents(SourceUrl & "Date.csv"),
+    Source = Web.Contents(#"[SourceUrl]" & "Date.csv"),
     Csv = Csv.Document(Source),
     #"Promoted Headers" = Table.PromoteHeaders(Csv, [PromoteAllScalars=true]),
     #"Changed Type" = Table.TransformColumnTypes(#"Promoted Headers",{{"DateKey", Int64.Type}, {"Calendar Year Number", Int64.Type}, {"Calendar Year", type text}, {"Calendar Year Quarter Number", Int64.Type}, {"Calendar Year Quarter", type text}, {"Calendar Year Month Number", Int64.Type}, {"Month Number", Int64.Type}, {"Month", type text}, {"Day of Week Number", Int64.Type}, {"Day of Week", type text}, {"Fiscal Year Number", Int64.Type}, {"Fiscal Year", type text}, {"Fiscal Quarter Number", Int64.Type}, {"Fiscal Quarter", type text}, {"Fiscal Year Quarter Number", Int64.Type}, {"Fiscal Year Quarter", type text}, {"Fiscal Month Number", Int64.Type}, {"Fiscal Month", type text}, {"Working Day", type text}, {"Is Holiday", Int64.Type}, {"Holiday Name", type text}, {"Europe Season", type text}, {"North America Season", type text}, {"Asia Season", type text}}),

diff --git a/Contoso Sales/Model/queries/Info.m b/Contoso Sales/Model/queries/Info.m
@@ -7,11 +7,12 @@
     ], 
     {
         { "Data Updated", DateTimeZone.RemoveZone(DateTimeZone.UtcNow()), null },
-        { "Version",      null,   #"Version" },
-        { "GitHub SHA",   null,   #"GH-SHA" },
-        { "GitHub RunID", null,   #"GH-RunId" },
-        { "Branch",       null,   #"GH-Branch" },
-        { "Environment",  null,   #"Environment"}
+        { "Version",            null,   #"[Version]" },
+        { "GitHub SHA",         null,   #"[GH-SHA]" },
+        { "GitHub RunID",       null,   #"[GH-RunId]" },
+        { "Branch",             null,   #"[GH-Branch]" },
+        { "pbi-tools Version",  null,   #"[PBITOOLS_VERSION]" },
+        { "Environment",        null,   #"[Environment]"}
     }
 )
 in

diff --git a/Contoso Sales/Model/queries/Product.m b/Contoso Sales/Model/queries/Product.m
@@ -1,5 +1,5 @@
 let
-    Source = Web.Contents(SourceUrl & "Product.csv"),
+    Source = Web.Contents(#"[SourceUrl]" & "Product.csv"),
     Csv = Csv.Document(Source),
     #"Promoted Headers" = Table.PromoteHeaders(Csv, [PromoteAllScalars=true]),
     #"Changed Type" = Table.TransformColumnTypes(#"Promoted Headers",{{"ProductKey", Int64.Type}, {"Product Code", type text}, {"Product Name", type text}, {"Manufacturer", type text}, {"Brand", type text}, {"Subcategory", type text}, {"Category", type text}, {"Color", type text}})

diff --git a/Contoso Sales/Model/queries/Promotion.m b/Contoso Sales/Model/queries/Promotion.m
@@ -1,5 +1,5 @@
 let
-    Source = Web.Contents(SourceUrl & "Promotion.csv"),
+    Source = Web.Contents(#"[SourceUrl]" & "Promotion.csv"),
     Csv = Csv.Document(Source),
     #"Promoted Headers" = Table.PromoteHeaders(Csv, [PromoteAllScalars=true]),
     #"Changed Type" = Table.TransformColumnTypes(#"Promoted Headers",{{"PromotionKey", Int64.Type}, {"Promotion Code", type text}, {"Promotion", type text}, {"Discount", type number}, {"Promotion Type", type text}, {"Promotion Category", type text}}),

diff --git a/Contoso Sales/Model/queries/Sales.m b/Contoso Sales/Model/queries/Sales.m
@@ -1,8 +1,9 @@
 let
-    Source = Web.Contents(SourceUrl & "Sales.csv"),
+    Source = Web.Contents(#"[SourceUrl]" & "Sales.csv"),
     Csv = Csv.Document(Source),
     #"Promoted Headers" = Table.PromoteHeaders(Csv, [PromoteAllScalars=true]),
     #"Changed Type" = Table.TransformColumnTypes(#"Promoted Headers",{{"StoreKey", Int64.Type}, {"ProductKey", Int64.Type}, {"PromotionKey", Int64.Type}, {"CurrencyKey", Int64.Type}, {"CustomerKey", Int64.Type}, {"OrderDateKey", Int64.Type},{"Order Line Number", Int64.Type}, {"Quantity", Int64.Type}, {"Unit Price", type number}, {"Unit Discount", type number}, {"Unit Cost", type number}, {"Net Price", type number}}),
-    #"Parsed Date" = Table.TransformColumns(#"Changed Type",{{"Delivery Date", each Date.From(DateTimeZone.From(_)), type date}, {"Order Date", each Date.From(DateTimeZone.From(_)), type date}})
+    #"Parsed Date" = Table.TransformColumns(#"Changed Type",{{"Delivery Date", each Date.From(DateTimeZone.From(_)), type date}, {"Order Date", each Date.From(DateTimeZone.From(_)), type date}}),
+    Filtered_Date = if #"[FilterDate]" = null then #"Parsed Date" else Table.SelectRows(#"Parsed Date", each [Order Date] >= #"[FilterDate]")
 in
-    #"Parsed Date"
+    Filtered_Date
diff --git a/Contoso Sales/Model/queries/Store.m b/Contoso Sales/Model/queries/Store.m
@@ -1,5 +1,5 @@
 let
-    Source = Web.Contents(SourceUrl & "Store.csv"),
+    Source = Web.Contents(#"[SourceUrl]" & "Store.csv"),
     Csv = Csv.Document(Source),
     #"Promoted Headers" = Table.PromoteHeaders(Csv, [PromoteAllScalars=true]),
     #"Changed Type" = Table.TransformColumnTypes(#"Promoted Headers",{{"StoreKey", Int64.Type}, {"Store Type", type text}, {"Store Name", type text}, {"Status", type text}, {"Zip Code", type text}, {"Zip Code Extension", type text}, {"Store Phone", type text}, {"Continent", type text}, {"City", type text}, {"State", type text}, {"CountryRegion", type text}, {"Address Line 1", type text}, {"Address Line 2", type text}, {"Close Reason", type text}, {"Employees", Int64.Type}, {"Selling Area", type number}}),

diff --git a/Contoso Sales/Model/queries/Environment.m → Contoso Sales/Model/queries/[Environment].m b/Contoso Sales/Model/queries/Environment.m → Contoso Sales/Model/queries/[Environment].m
diff --git a/Contoso Sales/Model/queries/[FilterDate].m b/Contoso Sales/Model/queries/[FilterDate].m
@@ -0,0 +1 @@
+#date(2009, 1, 1) meta [IsParameterQuery=true, Type="Date", IsParameterQueryRequired=false]
diff --git a/Contoso Sales/Model/queries/GH-Branch.m → Contoso Sales/Model/queries/[GH-Branch].m b/Contoso Sales/Model/queries/GH-Branch.m → Contoso Sales/Model/queries/[GH-Branch].m
diff --git a/Contoso Sales/Model/queries/GH-RunId.m → Contoso Sales/Model/queries/[GH-RunId].m b/Contoso Sales/Model/queries/GH-RunId.m → Contoso Sales/Model/queries/[GH-RunId].m
diff --git a/Contoso Sales/Model/queries/GH-SHA.m → Contoso Sales/Model/queries/[GH-SHA].m b/Contoso Sales/Model/queries/GH-SHA.m → Contoso Sales/Model/queries/[GH-SHA].m
diff --git a/Contoso Sales/Model/queries/[PBITOOLS_VERSION].m b/Contoso Sales/Model/queries/[PBITOOLS_VERSION].m
@@ -0,0 +1 @@
+"PBITOOLS_VERSION" meta [IsParameterQuery=true, Type="Text", IsParameterQueryRequired=true]
diff --git a/Contoso Sales/Model/queries/SourceUrl.m → Contoso Sales/Model/queries/[SourceUrl].m b/Contoso Sales/Model/queries/SourceUrl.m → Contoso Sales/Model/queries/[SourceUrl].m
diff --git a/Contoso Sales/Model/queries/Version.m → Contoso Sales/Model/queries/[Version].m b/Contoso Sales/Model/queries/Version.m → Contoso Sales/Model/queries/[Version].m
diff --git a/Contoso Sales/Model/tables/Customer/table.json b/Contoso Sales/Model/tables/Customer/table.json
@@ -8,11 +8,5 @@
         "type": "m"
       }
     }
-  ],
-  "annotations": [
-    {
-      "name": "PBI_ResultType",
-      "value": "Table"
-    }
   ]
 }
diff --git a/Contoso Sales/Model/tables/Date/table.json b/Contoso Sales/Model/tables/Date/table.json
@@ -9,11 +9,5 @@
         "type": "m"
       }
     }
-  ],
-  "annotations": [
-    {
-      "name": "PBI_ResultType",
-      "value": "Table"
-    }
   ]
 }