Backport master latest changes to next

.github/workflows/test.yml

@@ -5,6 +5,8 @@ on:
     branches:
       - master
       - next
+    tags:
+      - '*'
   pull_request:
 
 jobs:
@@ -57,6 +59,7 @@ jobs:
 
   doc-check:
     runs-on: ubuntu-latest
+    if: github.ref_type != 'tag'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -99,6 +102,7 @@ jobs:
 
   e-commerce:
     runs-on: ubuntu-latest
+    if: github.ref_type != 'tag'
     needs: [typecheck]
     steps:
       - name: Checkout
@@ -133,6 +137,7 @@ jobs:
 
   crm:
     runs-on: ubuntu-latest
+    if: github.ref_type != 'tag'
     needs: [typecheck]
     steps:
       - name: Checkout
@@ -157,7 +162,7 @@ jobs:
     runs-on: ubuntu-latest
     name: GreenFrame
     needs: [e-commerce]
-    if: success() && github.ref == 'refs/heads/master'
+    if: github.event_name == 'push' && github.ref_type == 'tag' && github.ref_name == 'refs/tags/v*' && !contains('beta', github.ref_name) && !contains('alpha', github.ref_name)
     steps:
       # To use this repository's private action,
       # you must check out the repository
@@ -208,3 +213,21 @@ jobs:
       - name: Run the tests
         working-directory: ./myadmin
         run: npm run test
+
+  update-sandbox-repository:
+    runs-on: ubuntu-latest
+    # Only run on new tags that target a release (not latest nor next) and avoid alpha and beta tags
+    if: github.event_name == 'push' && github.ref_type == 'tag' && github.ref_name == 'refs/tags/v*' && !contains('beta', github.ref_name) && !contains('alpha', github.ref_name)
+    needs: [typecheck, simple-example-typecheck, unit-test, e2e-test]
+    steps:
+        - name: Checkout
+          uses: actions/checkout@v3
+        - name: Use Node.js LTS
+          uses: actions/setup-node@v3
+          with:
+              node-version: '18.x'
+        - name: Update Sandbox Repository
+          env:
+              SSH_SANDBOX_DEPLOY_KEY: ${{ secrets.SSH_SANDBOX_DEPLOY_KEY }}
+              SANDBOX_REPOSITORY: ${{ secrets.SANDBOX_REPOSITORY }}
+          run: make update-sandbox

Makefile

@@ -172,3 +172,6 @@ storybook: ## Launch the storybook
 build-storybook: ## Build the storybook
 	@echo "Building storybook..."
 	@yarn build-storybook
+
+update-sandbox: ## Push the local version of the simple example to the sandbox repository
+	./scripts/update-sandbox.sh

docs/documentation.html

@@ -264,15 +264,7 @@ <h2>Recipes</h2>
                         class="needHelp"
                         style="text-align: center; padding-top: 0; color: #888"
                     >
-                        Need help with your React-admin app?
-                        <br />
-                        Turn to Marmelab, its creators and seasoned full-stack
-                        JS development agency.
-                        <br />
-                        <a href="mailto:react-admin-ee@marmelab.com"
-                            >Get in touch</a
-                        >
-                        to hire an expert for a day, or a team for a month.
+                        {% include newsletter.html %}
                     </div>
 
                     <div class="col s12 m9">

packages/ra-core/src/auth/useAuthState.ts

@@ -108,23 +108,37 @@ const useAuthState = <ErrorType = Error>(
 
     useEffect(() => {
         if (queryResult.data === undefined || queryResult.isFetching) return;
+        if (queryOptions.enabled === false) return;
         onSuccessEvent(queryResult.data);
-    }, [onSuccessEvent, queryResult.data, queryResult.isFetching]);
+    }, [
+        onSuccessEvent,
+        queryResult.data,
+        queryResult.isFetching,
+        queryOptions.enabled,
+    ]);
 
     useEffect(() => {
         if (queryResult.error == null || queryResult.isFetching) return;
+        if (queryOptions.enabled === false) return;
         onErrorEvent(queryResult.error);
-    }, [onErrorEvent, queryResult.error, queryResult.isFetching]);
+    }, [
+        onErrorEvent,
+        queryResult.error,
+        queryResult.isFetching,
+        queryOptions.enabled,
+    ]);
 
     useEffect(() => {
         if (queryResult.status === 'pending' || queryResult.isFetching) return;
+        if (queryOptions.enabled === false) return;
         onSettledEvent(queryResult.data, queryResult.error);
     }, [
         onSettledEvent,
         queryResult.data,
         queryResult.error,
         queryResult.status,
         queryResult.isFetching,
+        queryOptions.enabled,
     ]);
 
     const result = useMemo(() => {

scripts/update-sandbox.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# Configure git
+git config --global user.email "react-admin@marmelab.com"
+git config --global user.name "React-Admin CI"
+
+# Configure ssh keys
+mkdir --parents "$HOME/.ssh"
+DEPLOY_KEY_FILE="$HOME/.ssh/deploy_key"
+echo "${SSH_SANDBOX_DEPLOY_KEY}" > "$DEPLOY_KEY_FILE"
+chmod 600 "$DEPLOY_KEY_FILE"
+SSH_KNOWN_HOSTS_FILE="$HOME/.ssh/known_hosts"
+ssh-keyscan -H github.com > "$SSH_KNOWN_HOSTS_FILE"
+
+# Override the default git ssh command so that it includes our ssh key
+export GIT_SSH_COMMAND="ssh -i "$DEPLOY_KEY_FILE" -o UserKnownHostsFile=$SSH_KNOWN_HOSTS_FILE"
+
+# Clone the demo repository inside a temporary directory
+TEMPD=$(mktemp -d)
+echo $TEMPD
+(git clone ${SANDBOX_REPOSITORY} $TEMPD)
+
+# Clean it up to ensure we don't keep deleted files
+(rm -rf $TEMPD/src)
+(rm -rf $TEMPD/assets)
+
+# Copy the demo files into the temporary directory
+(cp -r ./examples/simple/. $TEMPD)
+# Install dependencies to that the sandbox has a lock file
+yarn install --cwd $TEMPD
+
+# Update the demo repository
+(cd $TEMPD && git add -A && git commit --allow-empty -m "Update sandbox" && git push)