Merge branch 'main' into gen1-lex-deprecation

Author: Vieltojarvi

src/components/Layout/Layout.tsx

@@ -283,11 +283,11 @@ export const Layout = ({
                     {(isGen1GettingStarted || isGen1HowAmplifyWorks) && (
                       <Gen1Banner currentPlatform={currentPlatform} />
                     )}
-                    {asPathWithNoHash.includes('/push-notifications/') ||
+                    {(asPathWithNoHash.includes('/push-notifications/') ||
                       asPathWithNoHash.includes('/analytics/') ||
-                      (asPathWithNoHash.includes('/in-app-messaging/') && (
-                        <PinpointEOLBanner />
-                      ))}
+                      asPathWithNoHash.includes('/in-app-messaging/')) && (
+                      <PinpointEOLBanner />
+                    )}
                     {asPathWithNoHash.includes('/interactions/') && (
                       <LexV1EOLBanner />
                     )}

src/fragments/lib-v1/flutter-maintenance.mdx

@@ -1,6 +1,6 @@
 <Callout warning>
 
-Amplify Flutter v1 is now in **Maintenance Mode** until April 30th, 2025. This means that we will continue to include updates to ensure compatibility with backend services and security. No new features will be introduced in v1.
+Amplify Flutter v1 is **deprecated** as of April 30th, 2025. No new features or bug fixes will be added. Dependencies may become outdated and potentially introduce compatibility issues.
 
 Please use the latest version (v2) of [Amplify Flutter](/gen1/[platform]/tools/libraries/) to get started.
 

src/pages/[platform]/build-a-backend/data/custom-subscription/index.mdx

@@ -156,6 +156,12 @@ sub.unsubscribe()
 
 ## (Optionally) Add server-side subscription filters
 
+<Callout info>
+
+**Note:** The custom subscription `.authorization()` modifier does not support the `owner` strategy. This differs from model subscriptions and may result in a subscription event being broadcast to a larger audience.
+
+</Callout>
+
 You can add subscription filters by adding arguments to the custom subscriptions. 
 
 {/* ### Basic subscription filters based on exact match

src/pages/[platform]/build-a-backend/data/data-modeling/secondary-index/index.mdx

@@ -1,5 +1,5 @@
 import { getCustomStaticPath } from '@/utils/getCustomStaticPath';
-
+// cspell:ignore ACCOUNTREPRESENTATIVEID
 export const meta = {
   title: 'Customize secondary indexes',
   description:
@@ -48,7 +48,7 @@ export const schema = a.schema({
 });
 ```
 
-<InlineFilter filters={["javascript", "angular", "react-native", "react", "nextjs", "vue", "android", "flutter"]}>
+<InlineFilter filters={["javascript", "angular", "react-native", "react", "nextjs", "vue", "android"]}>
 
 The example client query below allows you to query for "Customer" records based on their `accountRepresentativeId`:
 
@@ -104,6 +104,27 @@ let queriedCustomers = try await Amplify.API.query(
 ```
 
 </InlineFilter>
+
+<InlineFilter filters={["flutter"]}>
+
+The example client query below allows you to query for "Customer" records based on their `accountRepresentativeId`:
+
+```dart title="lib/main.dart"
+import 'package:amplify_api/amplify_api.dart';
+import 'package:amplify_flutter/amplify_flutter.dart';
+import 'models/ModelProvider.dart';
+
+// highlight-start
+final request = ModelQueries.list(
+  Customer.classType,
+  where: Customer.ACCOUNTREPRESENTATIVEID.eq(YOUR_REP_ID),
+);
+// highlight-end
+
+```
+
+</InlineFilter>
+
 <Accordion title="Review how this works under the hood with Amazon DynamoDB">
 
 Amplify uses Amazon DynamoDB tables as the default data source for `a.model()`. For key-value databases, it is critical to model your access patterns with "secondary indexes". Use the `.secondaryIndexes()` modifier to configure a secondary index.
@@ -133,7 +154,7 @@ export const schema = a.schema({
 });
 ```
 
-<InlineFilter filters={["javascript", "angular", "react-native", "react", "nextjs", "vue", "android", "flutter"]}>
+<InlineFilter filters={["javascript", "angular", "react-native", "react", "nextjs", "vue", "android",]}>
 
 On the client side, you should find a new `listBy...` query that's named after hash key and sort keys. For example, in this case: `listByAccountRepresentativeIdAndName`. You can supply the filter as part of this new list query:
 
@@ -185,6 +206,26 @@ let queriedCustomers = try await Amplify.API.query(
 ```
 </InlineFilter>
 
+<InlineFilter filters={["flutter"]}>
+
+The example client query below allows you to query for "Customer" records based on their `name` AND their `accountRepresentativeId`:
+
+```dart title="lib/main.dart"
+import 'package:amplify_api/amplify_api.dart';
+import 'package:amplify_flutter/amplify_flutter.dart';
+import 'models/ModelProvider.dart';
+
+// highlight-start
+final request = ModelQueries.list(
+  Customer.classType,
+  where: Customer.ACCOUNTREPRESENTATIVEID.eq(YOUR_REP_ID) & Customer.NAME.beginsWith("Rene"),
+);
+// highlight-end
+
+```
+
+</InlineFilter>
+
 ## Customize the query field for secondary indexes
 
 You can also customize the auto-generated query name under `client.models.<MODEL_NAME>.listBy...` by setting the `queryField()` modifier.
@@ -206,7 +247,7 @@ const schema = a.schema({
 });
 ```
 
-<InlineFilter filters={["javascript", "angular", "react-native", "react", "nextjs", "vue", "android", "flutter"]}>
+<InlineFilter filters={["javascript", "angular", "react-native", "react", "nextjs", "vue", "android"]}>
 
 In your client app code, you'll see query updated under the Data client:
 
@@ -258,6 +299,43 @@ let queriedCustomers = try await Amplify.API.query(
 ```
 </InlineFilter>
 
+<InlineFilter filters={["flutter"]}>
+
+In your client app code, you can use the updated query name.
+
+```dart title="lib/main.dart"
+import 'package:amplify_api/amplify_api.dart';
+import 'package:amplify_flutter/amplify_flutter.dart';
+import 'models/ModelProvider.dart';
+
+var accountRepresentativeId = "John";
+var operationName = "listByRep";
+var document = """
+  query ListByRep {
+    $operationName(accountRepresentativeId: "$accountRepresentativeId") {
+      items {
+        accountRepresentativeId
+        createdAt
+        id
+        name
+        phoneNumber
+        updatedAt
+      }
+      nextToken
+    }
+  }
+  """;
+
+final request = GraphQLRequest(
+  document: document,
+  variables: {
+    'accountRepresentativeId': accountRepresentativeId,
+    'operationName': operationName, 
+  },
+);
+```
+</InlineFilter>
+
 
 ## Customize the name of secondary indexes
 

src/pages/[platform]/build-a-backend/storage/copy-files/index.mdx

@@ -101,7 +101,7 @@ const copyFile = async () => {
       }
     });
   } catch (error) {
-    console.error('Error', err);
+    console.error('Error', error);
   }
 };
 ```

src/pages/[platform]/build-a-backend/storage/download-files/index.mdx

@@ -707,7 +707,7 @@ const { body, eTag } = await downloadData(
   {
     path: 'album/2024/1.jpg',
     options: {
-      onProgress: (progress) {
+      onProgress: (progress) => {
         console.log(`Download progress: ${(progress.transferredBytes/progress.totalBytes) * 100}%`);
       }
     }