Merge branch 'main' into maddylewis-patch-2

Author: maddylewis

.github/scripts/createDocsRoutes.ts

@@ -5,6 +5,7 @@ import type {ValueOf} from 'type-fest';
 type Article = {
     href: string;
     title: string;
+    order?: number;
 };
 
 type Section = {
@@ -60,11 +61,12 @@ function toTitleCase(str: string): string {
 /**
  * @param filename - The name of the file
  */
-function getArticleObj(filename: string): Article {
+function getArticleObj(filename: string, order?: number): Article {
     const href = filename.replace('.md', '');
     return {
         href,
         title: toTitleCase(href.replaceAll('-', ' ')),
+        order,
     };
 }
 
@@ -90,6 +92,12 @@ function pushOrCreateEntry<TKey extends HubEntriesKey>(hubs: Hub[], hub: string,
     }
 }
 
+function getOrderFromArticleFrontMatter(path: string): number | undefined {
+    const frontmatter = fs.readFileSync(path, 'utf8').split('---')[1];
+    const frontmatterObject = yaml.load(frontmatter) as Record<string, unknown>;
+    return frontmatterObject.order as number | undefined;
+}
+
 /**
  * Add articles and sections to hubs
  * @param hubs - The hubs inside docs/articles/ for a platform
@@ -113,7 +121,8 @@ function createHubsWithArticles(hubs: string[], platformName: ValueOf<typeof pla
 
             // Each subfolder will be a section containing articles
             fs.readdirSync(`${docsDir}/articles/${platformName}/${hub}/${section}`).forEach((subArticle) => {
-                articles.push(getArticleObj(subArticle));
+                const order = getOrderFromArticleFrontMatter(`${docsDir}/articles/${platformName}/${hub}/${section}/${subArticle}`);
+                articles.push(getArticleObj(subArticle, order));
             });
 
             pushOrCreateEntry(routeHubs, hub, 'sections', {

.storybook/webpack.config.ts

@@ -100,11 +100,6 @@ const webpackConfig = ({config}: {config: Configuration}) => {
         }),
     );
 
-    config.module.rules?.push({
-        test: /\.lottie$/,
-        type: 'asset/resource',
-    });
-
     return config;
 };
 

android/app/build.gradle

@@ -108,8 +108,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009000803
-        versionName "9.0.8-3"
+        versionCode 1009000901
+        versionName "9.0.9-1"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

docs/_data/_routes.yml

@@ -69,8 +69,8 @@ platforms:
         icon: /assets/images/handshake.svg
         description: Discover the benefits of becoming an Expensify Partner.
 
-      - href: integrations
-        title: Integrations
+      - href: connections
+        title: Connections
         icon: /assets/images/simple-illustration__monitor-remotesync.svg
         description: Integrate with accounting or HR software to streamline expense approvals.
 

docs/_includes/hub.html

@@ -12,13 +12,17 @@ <h1 class="title">
     {{ hub.description }}
 </p>
 
+{% assign sortedSectionsAndArticles = hub.sections | concat: hub.articles | sort: 'title' %}
+
 <section>
     <div class="cards-group">
-        {% for section in hub.sections %}
-            {% include section-card.html platform=activePlatform hub=hub.href section=section.href title=section.title %}
-        {% endfor %}
-        {% for article in hub.articles %}
-            {% include article-card.html hub=hub.href href=article.href title=article.title platform=activePlatform %}
+        {% for item in sortedSectionsAndArticles %}
+            <!-- The item is a section if it has articles inside it -->
+            {% if item.articles %}
+                {% include section-card.html platform=activePlatform hub=hub.href section=item.href title=item.title %}
+            {% else %}
+                {% include article-card.html hub=hub.href href=item.href title=item.title platform=activePlatform %}
+            {% endif %}
         {% endfor %}
     </div>
 </section>

docs/_includes/lhn-template.html

@@ -33,31 +33,31 @@
                             <span>{{ hub.title }}</span>
                         </div>
                         <ul class="nested-treeview">
-                            {% for section in hub.sections %}
-                                <li>
-                                    {% if section.href == activeSection %}
-                                        <div class="icon-with-link selected">
-                                            <a href="/{{ activePlatform }}/hubs/{{ hub.href }}"><img src="/assets/images/down.svg" class="base-icon"></img></a>
-                                            <span>{{ section.title }}</span>
-                                        </div>
-                                        <ul>
-                                            {% for article in section.articles %}
-                                                {% assign article_href = section.href | append: '/' | append: article.href %}
-                                                {% include lhn-article-link.html platform=activePlatform hub=hub.href href=article_href title=article.title %}
-                                            {% endfor %}
-                                        </ul>
-                                    {% else %}
-                                        <a href="{{ section.href }}" class="icon-with-link link">
-                                            <img src="/assets/images/arrow-right.svg" class="base-icon"></img>
-                                            {{ section.title }}
-                                        </a>
-                                    {% endif %}
-                                    
-                                </li>
-                            {% endfor %}
-
-                            {% for article in hub.articles %}
-                                {% include lhn-article-link.html platform=activePlatform hub=hub.href href=article.href title=article.title %}
+                            {% assign sortedSectionsAndArticles = hub.sections | concat: hub.articles | sort: 'title' %}
+                            {% for item in sortedSectionsAndArticles %}
+                                {% if item.articles %}
+                                    <li>
+                                        {% if item.href == activeSection %}
+                                            <div class="icon-with-link selected">
+                                                <a href="/{{ activePlatform }}/hubs/{{ hub.href }}"><img src="/assets/images/down.svg" class="base-icon"></img></a>
+                                                <span>{{ item.title }}</span>
+                                            </div>
+                                            <ul>
+                                                {% for article in item.articles %}
+                                                    {% assign article_href = item.href | append: '/' | append: article.href %}
+                                                    {% include lhn-article-link.html platform=activePlatform hub=hub.href href=article_href title=article.title %}
+                                                {% endfor %}
+                                            </ul>
+                                        {% else %}
+                                            <a href="{{ item.href }}" class="icon-with-link link">
+                                                <img src="/assets/images/arrow-right.svg" class="base-icon"></img>
+                                                {{ item.title }}
+                                            </a>
+                                        {% endif %}
+                                    </li>
+                                {% else %}
+                                    {% include lhn-article-link.html platform=activePlatform hub=hub.href href=item.href title=item.title %}
+                                {% endif %}
                             {% endfor %}
                         </ul>
                     {% else %}

docs/_includes/section.html

@@ -15,7 +15,8 @@ <h1 class="title">
 
 <section>
     <div class="cards-group">
-        {% for article in section.articles %}
+        {% assign sortedArticles = section.articles | sort: 'order', 'last' | default: 999 %}
+        {% for article in sortedArticles %}
             {% assign article_href = section.href | append: '/' | append: article.href %}
             {% include article-card.html hub=hub.href href=article_href title=article.title platform=activePlatform %}
         {% endfor %}