Merge pull request #1026 from vector-im/michaelk/data_id_tags
Add data ID tags for trafficlight adapter to find
This commit is contained in:
		
				commit
				
					
						52dccff229
					
				
			
		
					 10 changed files with 34 additions and 13 deletions
				
			
		
							
								
								
									
										3
									
								
								.github/workflows/build.yaml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.github/workflows/build.yaml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -23,9 +23,6 @@ jobs:
 | 
				
			||||||
          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
 | 
					          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
 | 
				
			||||||
          SENTRY_URL: ${{ secrets.SENTRY_URL }}
 | 
					          SENTRY_URL: ${{ secrets.SENTRY_URL }}
 | 
				
			||||||
          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
 | 
					          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
 | 
				
			||||||
          # This appears to be necessary to stop Vite from OOMing
 | 
					 | 
				
			||||||
          # https://github.com/vitejs/vite/issues/2433
 | 
					 | 
				
			||||||
          NODE_OPTIONS: "--max-old-space-size=16384"
 | 
					 | 
				
			||||||
      - name: Upload Artifact
 | 
					      - name: Upload Artifact
 | 
				
			||||||
        uses: actions/upload-artifact@v2
 | 
					        uses: actions/upload-artifact@v2
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										3
									
								
								.github/workflows/publish.yaml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.github/workflows/publish.yaml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -40,9 +40,6 @@ jobs:
 | 
				
			||||||
          SENTRY_URL: ${{ secrets.SENTRY_URL }}
 | 
					          SENTRY_URL: ${{ secrets.SENTRY_URL }}
 | 
				
			||||||
          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
 | 
					          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
 | 
				
			||||||
          VITE_APP_VERSION: ${{ github.event.release.tag_name }}
 | 
					          VITE_APP_VERSION: ${{ github.event.release.tag_name }}
 | 
				
			||||||
          # This appears to be necessary to stop Vite from OOMing
 | 
					 | 
				
			||||||
          # https://github.com/vitejs/vite/issues/2433
 | 
					 | 
				
			||||||
          NODE_OPTIONS: "--max-old-space-size=16384"
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
      - name: Create Tarball
 | 
					      - name: Create Tarball
 | 
				
			||||||
        env:
 | 
					        env:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,7 +3,7 @@
 | 
				
			||||||
  "type": "module",
 | 
					  "type": "module",
 | 
				
			||||||
  "scripts": {
 | 
					  "scripts": {
 | 
				
			||||||
    "dev": "vite",
 | 
					    "dev": "vite",
 | 
				
			||||||
    "build": "vite build",
 | 
					    "build": "NODE_OPTIONS=--max-old-space-size=16384 vite build",
 | 
				
			||||||
    "serve": "vite preview",
 | 
					    "serve": "vite preview",
 | 
				
			||||||
    "storybook": "start-storybook -p 6006",
 | 
					    "storybook": "start-storybook -p 6006",
 | 
				
			||||||
    "build-storybook": "build-storybook",
 | 
					    "build-storybook": "build-storybook",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -43,7 +43,9 @@ export function JoinExistingCallModal({ onJoin, onClose, ...rest }: Props) {
 | 
				
			||||||
        <p>{t("This call already exists, would you like to join?")}</p>
 | 
					        <p>{t("This call already exists, would you like to join?")}</p>
 | 
				
			||||||
        <FieldRow rightAlign className={styles.buttons}>
 | 
					        <FieldRow rightAlign className={styles.buttons}>
 | 
				
			||||||
          <Button onPress={onClose}>{t("No")}</Button>
 | 
					          <Button onPress={onClose}>{t("No")}</Button>
 | 
				
			||||||
          <Button onPress={onJoin}>{t("Yes, join call")}</Button>
 | 
					          <Button onPress={onJoin} data-testid="home_joinExistingRoom">
 | 
				
			||||||
 | 
					            {t("Yes, join call")}
 | 
				
			||||||
 | 
					          </Button>
 | 
				
			||||||
        </FieldRow>
 | 
					        </FieldRow>
 | 
				
			||||||
      </ModalContent>
 | 
					      </ModalContent>
 | 
				
			||||||
    </Modal>
 | 
					    </Modal>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -142,6 +142,7 @@ export const UnauthenticatedView: FC = () => {
 | 
				
			||||||
                type="text"
 | 
					                type="text"
 | 
				
			||||||
                required
 | 
					                required
 | 
				
			||||||
                autoComplete="off"
 | 
					                autoComplete="off"
 | 
				
			||||||
 | 
					                data-testid="home_callName"
 | 
				
			||||||
              />
 | 
					              />
 | 
				
			||||||
            </FieldRow>
 | 
					            </FieldRow>
 | 
				
			||||||
            <FieldRow>
 | 
					            <FieldRow>
 | 
				
			||||||
| 
						 | 
					@ -152,6 +153,7 @@ export const UnauthenticatedView: FC = () => {
 | 
				
			||||||
                placeholder={t("Display name")}
 | 
					                placeholder={t("Display name")}
 | 
				
			||||||
                type="text"
 | 
					                type="text"
 | 
				
			||||||
                required
 | 
					                required
 | 
				
			||||||
 | 
					                data-testid="home_displayName"
 | 
				
			||||||
                autoComplete="off"
 | 
					                autoComplete="off"
 | 
				
			||||||
              />
 | 
					              />
 | 
				
			||||||
            </FieldRow>
 | 
					            </FieldRow>
 | 
				
			||||||
| 
						 | 
					@ -171,7 +173,12 @@ export const UnauthenticatedView: FC = () => {
 | 
				
			||||||
                <ErrorMessage error={error} />
 | 
					                <ErrorMessage error={error} />
 | 
				
			||||||
              </FieldRow>
 | 
					              </FieldRow>
 | 
				
			||||||
            )}
 | 
					            )}
 | 
				
			||||||
            <Button type="submit" size="lg" disabled={loading}>
 | 
					            <Button
 | 
				
			||||||
 | 
					              type="submit"
 | 
				
			||||||
 | 
					              size="lg"
 | 
				
			||||||
 | 
					              disabled={loading}
 | 
				
			||||||
 | 
					              data-testid="home_go"
 | 
				
			||||||
 | 
					            >
 | 
				
			||||||
              {loading ? t("Loading…") : t("Go")}
 | 
					              {loading ? t("Loading…") : t("Go")}
 | 
				
			||||||
            </Button>
 | 
					            </Button>
 | 
				
			||||||
            <div id={recaptchaId} />
 | 
					            <div id={recaptchaId} />
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,4 +1,4 @@
 | 
				
			||||||
<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
 | 
					<svg data-testid="videoTile_muted" width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
 | 
				
			||||||
<path d="M0.20333 0.963373C0.474437 0.690007 0.913989 0.690007 1.1851 0.963373L11.5983 11.4633C11.8694 11.7367 11.8694 12.1799 11.5983 12.4533C11.3272 12.7267 10.8876 12.7267 10.6165 12.4533L0.20333 1.95332C-0.0677768 1.67995 -0.0677768 1.23674 0.20333 0.963373Z" fill="white"/>
 | 
					<path d="M0.20333 0.963373C0.474437 0.690007 0.913989 0.690007 1.1851 0.963373L11.5983 11.4633C11.8694 11.7367 11.8694 12.1799 11.5983 12.4533C11.3272 12.7267 10.8876 12.7267 10.6165 12.4533L0.20333 1.95332C-0.0677768 1.67995 -0.0677768 1.23674 0.20333 0.963373Z" fill="white"/>
 | 
				
			||||||
<path d="M0.418261 3.63429C0.226267 3.95219 0.115674 4.32557 0.115674 4.725V9.85832C0.115674 11.0181 1.0481 11.9583 2.19831 11.9583H8.65411L0.447396 3.66596C0.437225 3.65568 0.427513 3.64511 0.418261 3.63429Z" fill="white"/>
 | 
					<path d="M0.418261 3.63429C0.226267 3.95219 0.115674 4.32557 0.115674 4.725V9.85832C0.115674 11.0181 1.0481 11.9583 2.19831 11.9583H8.65411L0.447396 3.66596C0.437225 3.65568 0.427513 3.64511 0.418261 3.63429Z" fill="white"/>
 | 
				
			||||||
<path d="M9.95036 4.725V8.33212L4.30219 2.625H7.86772C9.01793 2.625 9.95036 3.5652 9.95036 4.725Z" fill="white"/>
 | 
					<path d="M9.95036 4.725V8.33212L4.30219 2.625H7.86772C9.01793 2.625 9.95036 3.5652 9.95036 4.725Z" fill="white"/>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
		 Before Width: | Height: | Size: 892 B After Width: | Height: | Size: 922 B  | 
| 
						 | 
					@ -383,11 +383,13 @@ export function InCallView({
 | 
				
			||||||
        key="1"
 | 
					        key="1"
 | 
				
			||||||
        muted={microphoneMuted}
 | 
					        muted={microphoneMuted}
 | 
				
			||||||
        onPress={toggleMicrophoneMuted}
 | 
					        onPress={toggleMicrophoneMuted}
 | 
				
			||||||
 | 
					        data-testid="incall_mute"
 | 
				
			||||||
      />,
 | 
					      />,
 | 
				
			||||||
      <VideoButton
 | 
					      <VideoButton
 | 
				
			||||||
        key="2"
 | 
					        key="2"
 | 
				
			||||||
        muted={localVideoMuted}
 | 
					        muted={localVideoMuted}
 | 
				
			||||||
        onPress={toggleLocalVideoMuted}
 | 
					        onPress={toggleLocalVideoMuted}
 | 
				
			||||||
 | 
					        data-testid="incall_videomute"
 | 
				
			||||||
      />
 | 
					      />
 | 
				
			||||||
    );
 | 
					    );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -398,6 +400,7 @@ export function InCallView({
 | 
				
			||||||
            key="3"
 | 
					            key="3"
 | 
				
			||||||
            enabled={isScreensharing}
 | 
					            enabled={isScreensharing}
 | 
				
			||||||
            onPress={toggleScreensharing}
 | 
					            onPress={toggleScreensharing}
 | 
				
			||||||
 | 
					            data-testid="incall_screenshare"
 | 
				
			||||||
          />
 | 
					          />
 | 
				
			||||||
        );
 | 
					        );
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -137,6 +137,7 @@ export function LobbyView({
 | 
				
			||||||
              size="lg"
 | 
					              size="lg"
 | 
				
			||||||
              disabled={state !== GroupCallState.LocalCallFeedInitialized}
 | 
					              disabled={state !== GroupCallState.LocalCallFeedInitialized}
 | 
				
			||||||
              onPress={onEnter}
 | 
					              onPress={onEnter}
 | 
				
			||||||
 | 
					              data-testid="lobby_joinCall"
 | 
				
			||||||
            >
 | 
					            >
 | 
				
			||||||
              Join call now
 | 
					              Join call now
 | 
				
			||||||
            </Button>
 | 
					            </Button>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -64,7 +64,13 @@ export function VideoPreview({
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  return (
 | 
					  return (
 | 
				
			||||||
    <div className={styles.preview} ref={previewRef}>
 | 
					    <div className={styles.preview} ref={previewRef}>
 | 
				
			||||||
      <video ref={videoRef} muted playsInline disablePictureInPicture />
 | 
					      <video
 | 
				
			||||||
 | 
					        ref={videoRef}
 | 
				
			||||||
 | 
					        muted
 | 
				
			||||||
 | 
					        playsInline
 | 
				
			||||||
 | 
					        disablePictureInPicture
 | 
				
			||||||
 | 
					        data-testid="preview_video"
 | 
				
			||||||
 | 
					      />
 | 
				
			||||||
      {state === GroupCallState.LocalCallFeedUninitialized && (
 | 
					      {state === GroupCallState.LocalCallFeedUninitialized && (
 | 
				
			||||||
        <Body fontWeight="semiBold" className={styles.cameraPermissions}>
 | 
					        <Body fontWeight="semiBold" className={styles.cameraPermissions}>
 | 
				
			||||||
          {t("Camera/microphone permissions needed to join the call.")}
 | 
					          {t("Camera/microphone permissions needed to join the call.")}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -154,6 +154,7 @@ export const VideoTile = forwardRef<HTMLElement, Props>(
 | 
				
			||||||
          "--tileHeight": height?.to((h) => `${h}px`),
 | 
					          "--tileHeight": height?.to((h) => `${h}px`),
 | 
				
			||||||
        }}
 | 
					        }}
 | 
				
			||||||
        ref={ref as ForwardedRef<HTMLDivElement>}
 | 
					        ref={ref as ForwardedRef<HTMLDivElement>}
 | 
				
			||||||
 | 
					        data-testid="videoTile"
 | 
				
			||||||
        {...rest}
 | 
					        {...rest}
 | 
				
			||||||
      >
 | 
					      >
 | 
				
			||||||
        {toolbarButtons.length > 0 && !maximised && (
 | 
					        {toolbarButtons.length > 0 && !maximised && (
 | 
				
			||||||
| 
						 | 
					@ -180,10 +181,17 @@ export const VideoTile = forwardRef<HTMLElement, Props>(
 | 
				
			||||||
                audioMuted && !videoMuted && !speaking && <MicMutedIcon />
 | 
					                audioMuted && !videoMuted && !speaking && <MicMutedIcon />
 | 
				
			||||||
              }
 | 
					              }
 | 
				
			||||||
              {videoMuted && <VideoMutedIcon />}
 | 
					              {videoMuted && <VideoMutedIcon />}
 | 
				
			||||||
              <span title={caption}>{caption}</span>
 | 
					              <span data-testid="videoTile_caption" title={caption}>
 | 
				
			||||||
 | 
					                {caption}
 | 
				
			||||||
 | 
					              </span>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
          ))}
 | 
					          ))}
 | 
				
			||||||
        <video ref={mediaRef} playsInline disablePictureInPicture />
 | 
					        <video
 | 
				
			||||||
 | 
					          data-testid="videoTile_video"
 | 
				
			||||||
 | 
					          ref={mediaRef}
 | 
				
			||||||
 | 
					          playsInline
 | 
				
			||||||
 | 
					          disablePictureInPicture
 | 
				
			||||||
 | 
					        />
 | 
				
			||||||
      </animated.div>
 | 
					      </animated.div>
 | 
				
			||||||
    );
 | 
					    );
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue