Merge branch 'main' into actually-test-packaged-app

Author: lerouxb

AUTHORS

@@ -95,3 +95,4 @@ Ruchitha Rajaghatta <[email protected]>
 syn-zhu <[email protected]>
 Nikola Irinchev <[email protected]>
 djechlin-mongodb <[email protected]>
+Dylan Richardson <[email protected]>

docs/tracking-plan.md

@@ -1,7 +1,7 @@
 
 # Compass Tracking Plan
 
-Generated on Mon, Dec 9, 2024 at 02:09 PM
+Generated on Mon, Dec 9, 2024 at 06:45 PM
 
 ## Table of Contents
 

package-lock.json

@@ -4,7 +4,6 @@ import type { AtlasUserInfo } from './util';
 export type ArgsWithSignal<T = Record<string, unknown>> = T & {
   signal?: AbortSignal;
 };
-export type SignInPrompt = 'none';
 
 type AtlasAuthServiceEvents = {
   'signed-in': [];
@@ -19,7 +18,7 @@ type AtlasAuthEventListener<T extends AtlasAuthEventNames> = (
 
 export abstract class AtlasAuthService extends EventEmitter {
   abstract signIn(
-    opts?: ArgsWithSignal<{ promptType?: SignInPrompt }>
+    opts?: ArgsWithSignal<{ mainProcessSignIn?: boolean }>
   ): Promise<AtlasUserInfo>;
   abstract signOut(): Promise<void>;
   abstract isAuthenticated(opts?: ArgsWithSignal): Promise<boolean>;

packages/atlas-service/src/atlas-auth-service.ts

@@ -43,7 +43,10 @@ describe('CompassAtlasAuthService', function () {
     const atlasAuthService = getAtlasAuthService({
       signIn: signInStub,
     });
-    await atlasAuthService.signIn({ signal: c.signal });
+    await atlasAuthService.signIn({
+      mainProcessSignIn: true,
+      signal: c.signal,
+    });
     expect(signInStub.calledOnce).to.be.true;
     expect(signInStub.firstCall.firstArg).to.deep.equal({ signal: c.signal });
   });

packages/atlas-service/src/compass-atlas-auth-service.spec.ts

@@ -1,9 +1,9 @@
 import { ipcRenderer } from 'hadron-ipc';
 import type { CompassAuthService as AtlasServiceMain } from './main';
-import { signInWithoutPrompt } from './store/atlas-signin-reducer';
+import { performSignInAttempt } from './store/atlas-signin-reducer';
 import { getStore } from './store/atlas-signin-store';
 import { AtlasAuthService } from './atlas-auth-service';
-import type { ArgsWithSignal, SignInPrompt } from './atlas-auth-service';
+import type { ArgsWithSignal } from './atlas-auth-service';
 
 export class CompassAtlasAuthService extends AtlasAuthService {
   private _ipc = ipcRenderer?.createInvoke<
@@ -37,15 +37,14 @@ export class CompassAtlasAuthService extends AtlasAuthService {
     return this.ipc.signOut();
   }
   signIn({
-    promptType,
+    mainProcessSignIn,
     signal,
-  }: ArgsWithSignal<{ promptType?: SignInPrompt }> = {}) {
-    switch (promptType) {
-      case 'none':
-        return getStore().dispatch(signInWithoutPrompt({ signal }));
-      default:
-        return this.ipc.signIn({ signal });
+  }: ArgsWithSignal<{ mainProcessSignIn?: boolean }> = {}) {
+    if (mainProcessSignIn) {
+      return this.ipc.signIn({ signal });
     }
+
+    return getStore().dispatch(performSignInAttempt({ signal }));
   }
   getUserInfo(opts?: ArgsWithSignal) {
     return this.ipc.getUserInfo(opts);

packages/atlas-service/src/compass-atlas-auth-service.ts

@@ -5,7 +5,7 @@ import {
   cancelSignIn,
   attemptId,
   AttemptStateMap,
-  signInWithoutPrompt,
+  performSignInAttempt,
 } from './atlas-signin-reducer';
 import { expect } from 'chai';
 import { configureStore } from './atlas-signin-store';
@@ -174,7 +174,7 @@ describe('atlasSignInReducer', function () {
         atlasAuthService: mockAtlasService as any,
       });
 
-      void store.dispatch(signInWithoutPrompt()).catch(() => {});
+      void store.dispatch(performSignInAttempt()).catch(() => {});
 
       await Promise.all([
         store.dispatch(signIn()),
@@ -184,7 +184,7 @@ describe('atlasSignInReducer', function () {
     });
   });
 
-  describe('signInWithoutPrompt', function () {
+  describe('performSignInAttempt', function () {
     it('should resolve when sign in flow finishes', async function () {
       const mockAtlasService = {
         isAuthenticated: sandbox.stub().resolves(false),
@@ -195,7 +195,7 @@ describe('atlasSignInReducer', function () {
       const store = configureStore({
         atlasAuthService: mockAtlasService as any,
       });
-      await store.dispatch(signInWithoutPrompt());
+      await store.dispatch(performSignInAttempt());
       expect(store.getState()).to.have.property('state', 'success');
     });
 
@@ -210,8 +210,8 @@ describe('atlasSignInReducer', function () {
         atlasAuthService: mockAtlasService as any,
       });
       try {
-        await store.dispatch(signInWithoutPrompt());
-        expect.fail('Expected signInWithoutPrompt action to throw');
+        await store.dispatch(performSignInAttempt());
+        expect.fail('Expected performSignInAttempt action to throw');
       } catch (err) {
         expect(err).to.have.property('message', 'Sign in failed');
       }
@@ -237,7 +237,7 @@ describe('atlasSignInReducer', function () {
       });
       const c = new AbortController();
       const signInPromise = store.dispatch(
-        signInWithoutPrompt({ signal: c.signal })
+        performSignInAttempt({ signal: c.signal })
       );
       c.abort(new Error('Aborted from outside'));
       try {

packages/atlas-service/src/store/atlas-signin-reducer.spec.ts

@@ -308,7 +308,7 @@ const startAttempt = (fn: () => void): AtlasSignInThunkAction<AttemptState> => {
   };
 };
 
-export const signInWithoutPrompt = ({
+export const performSignInAttempt = ({
   signal,
 }: { signal?: AbortSignal } = {}): AtlasSignInThunkAction<
   Promise<AtlasUserInfo>
@@ -348,7 +348,10 @@ export const signIn = (): AtlasSignInThunkAction<Promise<void>> => {
       if (await atlasAuthService.isAuthenticated({ signal })) {
         userInfo = await atlasAuthService.getUserInfo({ signal });
       } else {
-        userInfo = await atlasAuthService.signIn({ signal });
+        userInfo = await atlasAuthService.signIn({
+          mainProcessSignIn: true,
+          signal,
+        });
       }
       openToast('atlas-sign-in-success', {
         variant: 'success',

packages/atlas-service/src/store/atlas-signin-reducer.ts

@@ -82,6 +82,7 @@ export const KeyEditor: React.FunctionComponent<{
           enabled={!valid}
           trigger={({
             className,
+            children,
             // Having a tooltip connected to the input elements is not the most
             // accessible thing ever and so a lot of event listeners of the
             // tooltip conflict with the textarea default behavior (due to
@@ -93,6 +94,8 @@ export const KeyEditor: React.FunctionComponent<{
             onPointerUp,
             onPointerDown,
             onMouseDown,
+            /* eslint-enable @typescript-eslint/no-unused-vars */
+            ...triggerProps
           }: React.HTMLProps<HTMLInputElement>) => {
             return (
               <div className={className}>
@@ -118,7 +121,9 @@ export const KeyEditor: React.FunctionComponent<{
                   )}
                   style={{ width }}
                   spellCheck="false"
+                  {...triggerProps}
                 ></input>
+                {children}
               </div>
             );
           }}
@@ -185,6 +190,7 @@ export const ValueEditor: React.FunctionComponent<{
   onBlur,
 }) => {
   const val = String(value);
+  const darkMode = useDarkMode();
 
   const inputStyle = useMemo(() => {
     if (type === 'String') {
@@ -280,7 +286,11 @@ export const ValueEditor: React.FunctionComponent<{
                     className={cx(
                       editorReset,
                       editorOutline,
-                      !valid && editorInvalid
+                      !valid && editorInvalid,
+                      !valid &&
+                        (darkMode
+                          ? editorInvalidDarkMode
+                          : editorInvalidLightMode)
                     )}
                     style={inputStyle}
                     spellCheck="false"

packages/compass-components/src/components/document-list/element-editors.tsx

@@ -92,6 +92,17 @@ function useHadronElement(el: HadronElementType) {
     [el, forceUpdate]
   );
 
+  const onElementReverted = useCallback(
+    (changedElement: HadronElementType) => {
+      if (el.uuid === changedElement.uuid) {
+        // When an element is reverted we check again if the key is a duplicate.
+        setIsDuplicateKey(el.isDuplicateKey(el.key));
+        forceUpdate();
+      }
+    },
+    [el, forceUpdate]
+  );
+
   useEffect(() => {
     if (prevEl && prevEl !== el) {
       forceUpdate();
@@ -101,7 +112,7 @@ function useHadronElement(el: HadronElementType) {
   useEffect(() => {
     el.on(ElementEvents.Converted, onElementChanged);
     el.on(ElementEvents.Edited, onElementChanged);
-    el.on(ElementEvents.Reverted, onElementChanged);
+    el.on(ElementEvents.Reverted, onElementReverted);
     el.on(ElementEvents.Invalid, onElementChanged);
     el.on(ElementEvents.Valid, onElementChanged);
     el.on(ElementEvents.Added, onElementAddedOrRemoved);
@@ -113,15 +124,15 @@ function useHadronElement(el: HadronElementType) {
     return () => {
       el.off(ElementEvents.Converted, onElementChanged);
       el.off(ElementEvents.Edited, onElementChanged);
-      el.off(ElementEvents.Reverted, onElementChanged);
+      el.off(ElementEvents.Reverted, onElementReverted);
       el.off(ElementEvents.Valid, onElementChanged);
       el.off(ElementEvents.Added, onElementAddedOrRemoved);
       el.off(ElementEvents.Removed, onElementAddedOrRemoved);
       el.off(ElementEvents.Expanded, onElementChanged);
       el.off(ElementEvents.Collapsed, onElementChanged);
       el.off(ElementEvents.VisibleElementsChanged, onElementChanged);
     };
-  }, [el, onElementChanged, onElementAddedOrRemoved]);
+  }, [el, onElementChanged, onElementAddedOrRemoved, onElementReverted]);
 
   const isValid = el.isCurrentTypeValid();