app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Postgres2_Spec.ts (1)

1-731: 🛠️ Refactor suggestion

Replace Sleep and Wait calls with proper Cypress waiting mechanisms.

The test uses numerous instances of agHelper.Sleep() and cy.wait() which violate the coding guidelines and can lead to flaky tests. These fixed time delays should be replaced with Cypress's built-in waiting mechanisms.

Example patterns to use instead:

- agHelper.Sleep(2000);
+ cy.get('.selector').should('be.visible');

- cy.wait('@postExecute');
+ cy.wait('@postExecute').its('response.statusCode').should('eq', 200);

app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageServiceCEImpl.java (1)

280-293: Good implementation of metadata setting.

The method correctly retrieves and sets organization and instance IDs in the metadata map.

Consider adding error handling for cases where either Mono might fail, as this could affect the datasource storage flow.

 private Mono<DatasourceStorage> setAdditionalMetadataInDatasourceStorage(DatasourceStorage datasourceStorage) {
     Mono<String> organizationIdMono = organizationService.getCurrentUserOrganizationId();
     Mono<String> instanceIdMono = configService.getInstanceId();
 
     Map<String, Object> metadata = new HashMap<>();
 
-    return organizationIdMono.zipWith(instanceIdMono).map(tuple -> {
+    return organizationIdMono.zipWith(instanceIdMono)
+            .onErrorResume(error -> {
+                log.error("Error retrieving metadata for datasource storage: {}", error.getMessage());
+                return Mono.just(Tuples.of("", ""));
+            })
+            .map(tuple -> {
         // Change this to ORGANIZATION_ID once we have the organizationId field in the datasource storage
         metadata.put(ORGANIZATION_ID, tuple.getT1());
         metadata.put(INSTANCE_ID, tuple.getT2());
         datasourceStorage.setMetadata(metadata);
         return datasourceStorage;
-    });
+    });
 }

app/client/src/ce/navigation/FocusStrategy/types.ts (3)

22-24: Address eslint-disabled type issues now

Consider fixing the any types now rather than postponing. Using more specific types would improve type safety and make future maintenance easier.

-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  ) => Generator<any, Array<FocusPath>, any>;
+  ) => Generator<unknown, Array<FocusPath>, unknown>;

---

29-31: Address eslint-disabled type issues now

Same issue here - consider addressing these type issues now rather than later.

-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  ) => Generator<any, Array<FocusPath>, any>;
+  ) => Generator<unknown, Array<FocusPath>, unknown>;

---

41-43: Address eslint-disabled type issues now

And here as well - consider addressing these type issues now rather than later.

-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  ) => Generator<any, void, any>;
+  ) => Generator<unknown, void, unknown>;

app/client/src/ce/sagas/moduleInterfaceSagas.ts (1)

17-21: ⚠️ Potential issue

Generator function isn't using yield

The function is declared as a generator with the function* syntax, but it doesn't contain any yield statements. If this function doesn't need to yield control during execution, consider using a regular function instead.

-export function* handleModuleWidgetCreationSaga(
-  props: HandleModuleWidgetCreationSagaPayload,
-) {
-  return props.widgets;
-}
+export function handleModuleWidgetCreationSaga(
+  props: HandleModuleWidgetCreationSagaPayload,
+) {
+  return props.widgets;
+}

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

export function handleModuleWidgetCreationSaga(
  props: HandleModuleWidgetCreationSagaPayload,
) {
  return props.widgets;
}

🧰 Tools

🪛 Biome (1.9.4)

[error] 17-21: This generator function doesn't contain yield.

(lint/correctness/useYield)

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro (Legacy)