Sorting custom Period calculated table

Hi All,

I created a calculated table that defines custom periods. I use this in my report, so users can select the custom periods in a slicer. I run into an issue when I want to make timeline visuals. In a timeline visual my X-axis needs to be dynamic. When a user selects Period = Last week, the x-axis needs to be in days of week. And when the user selects this year, the axis needs to be in months of year.

I partly solved this by adding the X-as column in my calculated table. But I cannot find a way to get the sorting fixed. I did add a sorting column at the bottom of the code, but power bi desktop won't let me sort x-axis on column "sortering". Which I understand, because there's no one to one mapping.

An alternative would be to show X-axis key on the X-axis of the visual, but I don't like the look of that.

If anyone can tell me how I can fix this sorting issue, you'd be my hero!

DAX Code:

Period Selection =
VAR _Today = TODAY()
VAR _TodayYear = YEAR(_Today)
VAR _TodayMonth = MONTH(_Today)
VAR _TodayLastWeek = _Today - 7
VAR _YearLastWeek = YEAR(_TodayLastWeek)
VAR _DayOfYear = DATEDIFF(DATE(_TodayYear, 1, 1), _Today, DAY) + 1

VAR _OptionToday =
SELECTCOLUMNS(
FILTER(
'Date',
Date[Date] = _Today
),
"Date", 'Date'[Date],
"Period", "Today",
"X-axis", Date[ShortDayName],
"Order", 1
)

VAR _Yesterday =
SELECTCOLUMNS(
FILTER(
'Date',
Date[Date] = _Today - 1
),
"Date", 'Date'[Date],
"Period", "Yesterday",
"X-axis", Date[ShortDayName],
"Order", 2
)

VAR _Last7Days =
SELECTCOLUMNS(
FILTER(
'Date',
Date[Date] <= _Today &&
Date[Date] >= _Today - 6
),
"Date", 'Date'[Date],
"Period", "Last 7 days",
"X-axis", Date[ShortDayName],
"Order", 3
)

VAR _ThisWeek =
SELECTCOLUMNS(
FILTER(
'Date',
Date[WeekNumber] = WEEKNUM(_Today) &&
Date[DayOfWeek] <= WEEKDAY(_Today, 2) &&
Date[Year] = _TodayYear
),
"Date", 'Date'[Date],
"Period", "This week",
"X-axis", Date[ShortDayName],
"Order", 4
)

VAR _LastWeek =
SELECTCOLUMNS(
FILTER(
'Date',
Date[WeekNumber] = WEEKNUM(_TodayLastWeek) &&
Date[Year] = _YearLastWeek
),
"Date", 'Date'[Date],
"Period", "Last week",
"X-axis", Date[ShortDayName],
"Order", 5
)

VAR _Last30Days =
SELECTCOLUMNS(
FILTER(
'Date',
Date[Date] <= _Today &&
Date[Date] >= _Today - 29
),
"Date", 'Date'[Date],
"Period", "Last 30 days",
"X-axis", Date[DayOfMonth],
"Order", 6
)

VAR _ThisMonth =
SELECTCOLUMNS(
FILTER(
'Date',
Date[MonthNumber] = _TodayMonth &&
Date[DayOfMonth] <= DAY(_Today) &&
Date[Year] = _TodayYear
),
"Date", 'Date'[Date],
"Period", "This month",
"X-axis", Date[DayOfMonth],
"Order", 7
)

VAR _LastMonth =
SELECTCOLUMNS(
FILTER(
'Date',
Date[MonthNumber] = MONTH(EDATE(_Today, -1)) &&
Date[Year] = YEAR(EDATE(_Today, -1))
),
"Date", 'Date'[Date],
"Period", "Last month",
"X-axis", Date[DayOfMonth],
"Order", 8
)

VAR _Last3Months =
SELECTCOLUMNS(
FILTER(
'Date',
Date[Date] <= _Today &&
Date[Date] >= EDATE(_Today, - 3)
),
"Date", 'Date'[Date],
"Period", "Last 3 months",
"X-axis", Date[Week],
"Order", 9
)

VAR _Last6Months =
SELECTCOLUMNS(
FILTER(
'Date',
Date[Date] <= _Today &&
Date[Date] >= EDATE(_Today, - 6)
),
"Date", 'Date'[Date],
"Period", "Last 6 months",
"X-axis", Date[Week],
"Order", 10
)

VAR _ThisYear =
SELECTCOLUMNS(
FILTER(
'Date',
Date[Year] = _TodayYear &&
Date[DayOfYear] <= _DayOfYear
),
"Date", 'Date'[Date],
"Period", "This year",
"X-axis", Date[MonthOfYear],
"Order", 11
)

VAR _LastYear =
SELECTCOLUMNS(
FILTER(
'Date',
Date[Year] = _TodayYear - 1
),
"Date", 'Date'[Date],
"Period", "Last year",
"X-axis", Date[MonthOfYear],
"Order", 12
)

VAR _Other =
SELECTCOLUMNS(
'Date',
"Date", 'Date'[Date],
"Period", "Other",
"X-axis", Date[QuarterOfYear],
"Order", 13
)

VAR _Combined =
UNION(_OptionToday, _Yesterday, _Last7Days, _ThisWeek, _LastWeek, _Last30Days, _ThisMonth, _LastMonth, _Last3Months, _Last6Months, _LastYear, _ThisYear, _Other)

VAR _WithXAxisKey =
ADDCOLUMNS(
_Combined,
"X-axis key",
[Period] & " - " & [X-axis]
)

VAR _WithSorting =
ADDCOLUMNS(
_WithXAxisKey,
"Sorting",
RANKX(
FILTER(
_WithXAxisKey,
[Order] = EARLIER([Order])
),
[Date],
,ASC,Dense
)
)

RETURN
_WithSorting