diff --git a/README.md b/README.md index 0edb7891..1839ed3a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Azure Url Shortener (AzUrlShortener) -![GitHub Release](https://img.shields.io/github/v/release/microsoft/AzUrlShortener) ![.NET](https://img.shields.io/badge/9.0-512BD4?logo=dotnet&logoColor=fff) [![Build](https://github.com/microsoft/AzUrlShortener/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/microsoft/AzUrlShortener/actions/workflows/build.yml) ![GitHub License](https://img.shields.io/github/license/microsoft/AzUrlShortener) +![GitHub Release](https://img.shields.io/github/v/release/microsoft/AzUrlShortener) ![.NET](https://img.shields.io/badge/9.0-512BD4?logo=dotnet&logoColor=fff) [![Build](https://github.com/microsoft/AzUrlShortener/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/microsoft/AzUrlShortener/actions/workflows/build.yml) ![GitHub License](https://img.shields.io/github/license/microsoft/AzUrlShortener) [![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?&logo=discord&logoColor=white)](https://discord.gg/6zA3jKw) [![All Contributors](https://img.shields.io/badge/all_contributors-23-orange.svg?style=flat-square)](#contributors-) diff --git a/doc/how-to-migrate-data.md b/doc/how-to-migrate-data.md index 793bb38b..fe7de4e1 100644 --- a/doc/how-to-migrate-data.md +++ b/doc/how-to-migrate-data.md @@ -1,16 +1,28 @@ -# How to migrate your data +# HowAzure Storage Explorer is a free tool to manage your Azure cloud storage resources (aka your short URLs) from your desktop. It's cross-platform and can be downloaded [here](https://azure.microsoft.com/en-us/products/storage/storage-explorer/). +In the resources deployed to Azure, there will be 2 storage accounts. One for the redirect service (azfunc-light) and one acting as the data store. That last one is the one you want to use for the data migration. The name of that storage account should start with `urldata`. migrate your data -The easiest way to migrate your data between account or from an ealier version of AzUrlShortener is to use the **Azure Storage Explorer** to export the data as a CSV files and use the TinyBlazorAdmin to import the files . - +The easiest way to migrate your data between accounts or from an earlier version of AzUrlShortener is to use the **Azure Storage Explorer** to export the data as CSV files and use the TinyBlazorAdmin to import the files. Azure Storage Explorer is a free tool to manage your Azure cloud storage resources (aka your short URLs) from your desktop. It’s a cross-platform and can be downloaded [here](https://azure.microsoft.com/en-us/products/storage/storage-explorer/). In the resources deployed to Azure there will be 2 storage accounts. One for the redirect service (azfunc-light) and one acting as the data store. That last one is the one you want to use for the data migration. The name of that storage account should start wirh `urldata`. -You need to expot to CSV the following tables: +You need to export to CSV the following tables: - UrlsDetails: This table contains the details of the short URLs, including the original URL, the short URL, schedules, etc. -- ClickStats: This table contains the clicks informations. +- ClickStats: This table contains the click information. + +The best settings to export when planning to import using the TinyBlazorAdmin are: +![export_settings](../images/export_settings.png) To import the data use the Import button in the Settings page. + +If you have customized the structure of the tables by adding custom columns, you will need to import the data using Azure Storage Explorer instead to keep those columns. + +Here are the settings to use when importing using Azure Storage Explorer: +- Make sure you use the same column delimiters as used in the export. +- You need to select the data type for each column. +- Uncheck the checkbox *Ignore empty string values*. + +![Import settings when using Azure Storage Explorer](../images/import_using_azStorage-explorer.png) diff --git a/images/export_settings.png b/images/export_settings.png new file mode 100644 index 00000000..444159fb Binary files /dev/null and b/images/export_settings.png differ diff --git a/images/import_using_azStorage-explorer.png b/images/import_using_azStorage-explorer.png new file mode 100644 index 00000000..e40995d8 Binary files /dev/null and b/images/import_using_azStorage-explorer.png differ diff --git a/src/Api/Cloud5mins.ShortenerTools.Api.csproj b/src/Api/Cloud5mins.ShortenerTools.Api.csproj index 7eb8724c..72f6e810 100644 --- a/src/Api/Cloud5mins.ShortenerTools.Api.csproj +++ b/src/Api/Cloud5mins.ShortenerTools.Api.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/AppHost/Cloud5mins.ShortenerTools.AppHost.csproj b/src/AppHost/Cloud5mins.ShortenerTools.AppHost.csproj index 3755ab57..af13af0c 100644 --- a/src/AppHost/Cloud5mins.ShortenerTools.AppHost.csproj +++ b/src/AppHost/Cloud5mins.ShortenerTools.AppHost.csproj @@ -1,6 +1,6 @@ - + Exe @@ -11,9 +11,9 @@ - - - + + + diff --git a/src/Core/Cloud5mins.ShortenerTools.Core.csproj b/src/Core/Cloud5mins.ShortenerTools.Core.csproj index 661d2c40..20511850 100644 --- a/src/Core/Cloud5mins.ShortenerTools.Core.csproj +++ b/src/Core/Cloud5mins.ShortenerTools.Core.csproj @@ -5,11 +5,10 @@ enable - - - + + + - \ No newline at end of file diff --git a/src/FunctionsLight/Cloud5mins.ShortenerTools.FunctionsLight.csproj b/src/FunctionsLight/Cloud5mins.ShortenerTools.FunctionsLight.csproj index badba391..d93ee274 100644 --- a/src/FunctionsLight/Cloud5mins.ShortenerTools.FunctionsLight.csproj +++ b/src/FunctionsLight/Cloud5mins.ShortenerTools.FunctionsLight.csproj @@ -12,9 +12,9 @@ - + - + diff --git a/src/ServiceDefaults/Cloud5mins.ShortenerTools.ServiceDefaults.csproj b/src/ServiceDefaults/Cloud5mins.ShortenerTools.ServiceDefaults.csproj index eeda27dd..07608ebb 100644 --- a/src/ServiceDefaults/Cloud5mins.ShortenerTools.ServiceDefaults.csproj +++ b/src/ServiceDefaults/Cloud5mins.ShortenerTools.ServiceDefaults.csproj @@ -10,13 +10,13 @@ - - - - - - - + + + + + + + diff --git a/src/TinyBlazorAdmin/Components/Pages/Help.razor b/src/TinyBlazorAdmin/Components/Pages/Help.razor index ef55b542..c2431d88 100644 --- a/src/TinyBlazorAdmin/Components/Pages/Help.razor +++ b/src/TinyBlazorAdmin/Components/Pages/Help.razor @@ -6,7 +6,7 @@
  • This is an admin tool, it can create, modify and delete any URL in your data store. Make sure you secure it properly.
  • -
  • Refer to the documentation on GitHub for more details.
  • -
  • Having an issue or an idea for a new feature? Please check the GitHub [issues](https://github.com/microsoft/AzUrlShortener/issues) or [discussions](https://github.com/microsoft/AzUrlShortener/discussions).
  • +
  • Refer to the documentation on GitHub for more details.
  • +
  • Having an issue or an idea for a new feature? Please check the GitHub issues or discussions.
\ No newline at end of file