add default rules

src/api-gateway/api-gateway.graphql

@@ -50,7 +50,7 @@ type FlagDetails {
   salt: String!
   sel: String!
   targets: [Target!]!
-  rules: [Rule!]!
+  rules: [Rule!]
   fallthrough: Fallthrough!
   offVariation: Int!
   variations: [Boolean!]!
@@ -102,14 +102,14 @@ type Query {
 }
 
 type Rule {
-  id: ID!
+  id: ID
   variation: Int!
   clauses: [Clause!]!
   trackEvents: Boolean!
 }
 
 input RuleInput {
-  id: ID!
+  id: ID
   variation: Int!
   clauses: [ClauseInput!]!
   trackEvents: Boolean!

src/api-gateway/resolvers/flag-resolver.ts

@@ -12,6 +12,7 @@ import {
   Query,
   Resolver,
 } from "type-graphql";
+import { v4 as uuid } from "uuid";
 import { IContext } from "@/api-gateway/api-gateway";
 import { ForbiddenError } from "apollo-server-koa";
 import { UserWorkspaceModel } from "@/model/user-workspace-model";
@@ -72,8 +73,8 @@ class Fallthrough {
 
 @ObjectType()
 class Rule {
-  @Field(() => ID)
-  id: string;
+  @Field(() => ID, { nullable: true })
+  id?: string;
 
   @Field(() => Int)
   variation: number;
@@ -87,8 +88,8 @@ class Rule {
 
 @InputType()
 class RuleInput {
-  @Field(() => ID)
-  id: string;
+  @Field(() => ID, { nullable: true })
+  id?: string;
 
   @Field(() => Int)
   variation: number;
@@ -147,7 +148,7 @@ class FlagDetails {
   @Field(() => [Target])
   targets: Array<Target>;
 
-  @Field(() => [Rule])
+  @Field(() => [Rule], { nullable: true })
   rules: Array<Rule>;
 
   @Field(() => Fallthrough)
@@ -242,7 +243,7 @@ export class FlagResolver {
 
     const [total, flags] = await Promise.all([
       flagModel.estimatedDocumentCount({ workspace: workspaceId }),
-      flagModel.find(query).skip(skip).limit(limit).exec(),
+      flagModel.find(query).skip(skip).limit(limit).lean(),
     ]);
     for (const f of flags) {
       // @ts-ignore
@@ -291,6 +292,9 @@ export class FlagResolver {
       const updated = {} as Record<string, unknown>;
 
       if (rules) {
+        for (const r of rules) {
+          r.id = r.id || uuid();
+        }
         updated.rules = rules;
       }
 

src/model/flag-model.ts

@@ -54,8 +54,8 @@ export class Flag extends TimeStamps {
   }>;
 
   @prop()
-  rules: Array<{
-    id: string;
+  rules?: Array<{
+    id?: string;
     variation: number;
     clauses: Array<{
       attribute: string;

src/shared/feature-flags/flags-status-table.tsx

@@ -31,7 +31,7 @@ const columns: ColumnsType<FlagsStatus_flagsStatus_flags> = [
         val = variations[record.offVariation];
       } else {
         const set = new Set();
-        for (const r of record.rules) {
+        for (const r of record.rules || []) {
           set.add(variations[r.variation]);
         }
         set.add(variations[record.fallthrough.variation]);

src/shared/flag-details/rules.tsx

@@ -13,11 +13,41 @@ export type RulesProps = {
   variance: boolean[];
 };
 
+const getDefaultRules = (): FlagDetails_flagDetails_rules[] => [
+  {
+    id: null,
+    clauses: [
+      {
+        attribute: "email",
+        op: "endsWith",
+        values: [],
+        negate: false,
+      },
+    ],
+    variation: 0,
+    trackEvents: false,
+  },
+  {
+    id: null,
+    clauses: [
+      {
+        attribute: "email",
+        op: "startsWith",
+        values: [],
+        negate: false,
+      },
+    ],
+    variation: 0,
+    trackEvents: false,
+  },
+];
+
 export function Rules({ rules, variance }: RulesProps): JSX.Element {
+  const conertedRules = rules && rules.length ? rules : getDefaultRules();
   return (
     <Row gutter={[12, 12]}>
       <Col>Target users who match these rules</Col>
-      {rules.map((r, i) => (
+      {conertedRules.map((r, i) => (
         <Col key={i} span={24}>
           <Rule rule={r} variance={variance} index={i} />
         </Col>