feat: fixed test, resolved another edgecase in dashboard and added label to conditions in secrets

backend/e2e-test/routes/v3/secrets.spec.ts

@@ -812,6 +812,8 @@ describe.each([{ auth: AuthMode.JWT }, { auth: AuthMode.IDENTITY_ACCESS_TOKEN }]
         },
         body: createSecretReqBody
       });
+      console.log(">>>>>>>>>>");
+      console.log(createSecRes.payload);
       expect(createSecRes.statusCode).toBe(200);
       const createdSecretPayload = JSON.parse(createSecRes.payload);
       expect(createdSecretPayload).toHaveProperty("secret");

backend/src/ee/services/permission/permission-dal.ts

@@ -441,7 +441,7 @@ export const permissionDALFactory = (db: TDbClient) => {
             .on(`${TableName.Identity}.id`, `${TableName.IdentityMetadata}.identityId`)
             .andOn(`${TableName.Project}.orgId`, `${TableName.IdentityMetadata}.orgId`);
         })
-        .where("identityId", identityId)
+        .where(`${TableName.IdentityProjectMembership}.identityId`, identityId)
         .where(`${TableName.IdentityProjectMembership}.projectId`, projectId)
         .select(selectAllTableCols(TableName.IdentityProjectMembershipRole))
         .select(

backend/src/server/routes/v1/dashboard-router.ts

@@ -200,7 +200,7 @@ export const registerDashboardRouter = async (server: FastifyZodProvider) => {
           )
         );
 
-      if (includeDynamicSecrets) {
+      if (includeDynamicSecrets && permissiveEnvs.length) {
         // this is the unique count, ie duplicate secrets across envs only count as 1
         totalDynamicSecretCount = await server.services.dynamicSecret.getCountMultiEnv({
           actor: req.permission.type,
@@ -241,7 +241,7 @@ export const registerDashboardRouter = async (server: FastifyZodProvider) => {
         }
       }
 
-      if (includeSecrets) {
+      if (includeSecrets && permissiveEnvs.length) {
         // this is the unique count, ie duplicate secrets across envs only count as 1
         totalSecretCount = await server.services.secret.getSecretsCountMultiEnv({
           actorId: req.permission.id,