Merge branch 'v2' into gm/get-its-passing

Author: GeorgeMac

core/validation/flipt.cue

@@ -25,7 +25,7 @@ close({
 		#FlagBoolean | *{}
 	}
 	if version == "1.3" || version == "1.4" || version == "1.5" {
-		metadata: [string]: (string | int | bool | float)
+		metadata: [string]: !=null
 	}
 }
 

internal/storage/environments/fs/flipt/flags.go

@@ -65,9 +65,6 @@ func (f *FlagStorage) GetResource(ctx context.Context, fs environmentsfs.Filesys
 					return nil, err
 				}
 
-				// TODO: remove this after ui is complete
-				f.logger.Debug("get flag", zap.Any("flag", payload))
-
 				return &rpcenvironments.Resource{
 					Namespace: namespace,
 					Key:       ff.Key,
@@ -128,9 +125,6 @@ func (f *FlagStorage) PutResource(ctx context.Context, fs environmentsfs.Filesys
 		return err
 	}
 
-	// TODO: remove this after ui is complete
-	f.logger.Debug("put flag", zap.Any("flag", flag))
-
 	docs, idx, err := getDocsAndNamespace(ctx, fs, rs.Namespace)
 	if err != nil {
 		return err

ui/package-lock.json

@@ -11,7 +11,8 @@
     "lint:fix": "eslint src --fix",
     "format": "prettier --write .",
     "format:check": "prettier --check .",
-    "test": "jest"
+    "test": "jest",
+    "knip": "knip"
   },
   "dependencies": {
     "@codemirror/lang-json": "^6.0.1",
@@ -65,7 +66,7 @@
     "@trivago/prettier-plugin-sort-imports": "^5.2.2",
     "@types/jest": "^29.5.14",
     "@types/loadable__component": "^5.13.9",
-    "@types/node": "^18.19.71",
+    "@types/node": "^18.19.75",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
     "@types/react-helmet": "^6.1.11",
@@ -96,6 +97,7 @@
     "eslint-plugin-react-hooks": "^4.6.2",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
+    "knip": "^5.43.6",
     "package-changed": "^3.0.0",
     "playwright": "^1.49.1",
     "postcss": "^8.4.49",
@@ -106,7 +108,7 @@
     "tailwindcss-bg-patterns": "^0.3.0",
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
-    "typescript": "^4.9.5",
+    "typescript": "^5.7.3",
     "vite": "^5.4.11"
   }
 }

ui/package.json

@@ -10,6 +10,7 @@ import { v4 as uuidv4 } from 'uuid';
 import * as Yup from 'yup';
 
 import { useListAuthProvidersQuery } from '~/app/auth/authApi';
+import { selectCurrentEnvironment } from '~/app/environments/environmentsApi';
 import { useListFlagsQuery } from '~/app/flags/flagsApi';
 import { selectCurrentNamespace } from '~/app/namespaces/namespacesApi';
 
@@ -41,8 +42,6 @@ import {
   getErrorMessage
 } from '~/utils/helpers';
 
-import { selectCurrentEnvironment } from '../environments/environmentsApi';
-
 function ResetOnNamespaceChange({ namespace }: { namespace: INamespace }) {
   const { resetForm } = useFormikContext();
 

ui/src/app/console/Console.tsx

@@ -93,6 +93,7 @@ export default function Flag() {
           }
           onSuccess={() => {
             navigate(`/namespaces/${namespace.key}/flags`);
+            setSuccess('Successfully deleted flag');
           }}
         />
       </Modal>

ui/src/app/flags/Flag.tsx

@@ -17,7 +17,6 @@ import { StarIcon } from '@heroicons/react/24/outline';
 import { useFormikContext } from 'formik';
 import { useContext, useMemo, useRef, useState } from 'react';
 import { useSelector } from 'react-redux';
-import { v4 as uuid } from 'uuid';
 
 import { selectCurrentEnvironment } from '~/app/environments/environmentsApi';
 import { selectCurrentNamespace } from '~/app/namespaces/namespacesApi';

ui/src/app/flags/rules/Rules.tsx

@@ -94,6 +94,7 @@ export default function Segment() {
           }
           onSuccess={() => {
             navigate(`/namespaces/${namespace.key}/segments`);
+            setSuccess('Successfully deleted segment');
           }}
         />
       </Modal>

ui/src/app/segments/Segment.tsx

@@ -29,7 +29,8 @@
   --red-50: 127 29 29;
 
   .shadow {
-    --tw-shadow: 0 1px 3px 0 rgba(255, 255, 255, 0.1),
+    --tw-shadow:
+      0 1px 3px 0 rgba(255, 255, 255, 0.1),
       0 1px 2px 0 rgba(255, 255, 255, 0.06);
   }
 
@@ -38,17 +39,20 @@
   }
 
   .shadow-md {
-    --tw-shadow: 0 4px 6px -1px rgba(255, 255, 255, 0.1),
+    --tw-shadow:
+      0 4px 6px -1px rgba(255, 255, 255, 0.1),
       0 2px 4px -1px rgba(255, 255, 255, 0.06);
   }
 
   .shadow-lg {
-    --tw-shadow: 0 10px 15px -3px rgba(255, 255, 255, 0.1),
+    --tw-shadow:
+      0 10px 15px -3px rgba(255, 255, 255, 0.1),
       0 4px 6px -2px rgba(255, 255, 255, 0.05);
   }
 
   .shadow-xl {
-    --tw-shadow: 0 20px 25px -5px rgba(255, 255, 255, 0.1),
+    --tw-shadow:
+      0 20px 25px -5px rgba(255, 255, 255, 0.1),
       0 10px 10px -5px rgba(255, 255, 255, 0.04);
   }
 

ui/src/assets/colors/dark.css

@@ -74,25 +74,13 @@ export default function Footer() {
               <a
                 target="_blank"
                 rel="noreferrer"
-                href="https://features.flipt.io/changelog"
+                href="https://docs.flipt.io/changelog/overview"
                 className="text-violet-500"
               >
                 Changelog
               </a>
             </span>
           </p>
-          <p className="mt-4 text-xs text-gray-500 sm:mt-0">
-            <span className="hidden sm:inline">
-              <a
-                target="_blank"
-                rel="noreferrer"
-                href="https://features.flipt.io"
-                className="text-violet-500"
-              >
-                Share Feedback
-              </a>
-            </span>
-          </p>
         </div>
         <span className="mt-4 inline-flex justify-center space-x-5 sm:ml-auto sm:mt-0 sm:justify-start">
           {social.map((item) => (