Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Connect My Computer: Use a single document #31699

Merged
merged 3 commits into from
Sep 12, 2023
Merged

Conversation

gzdunek
Copy link
Contributor

@gzdunek gzdunek commented Sep 11, 2023

Contributes to #27881

Initially, we added two types of documents: doc.connect_my_computer_setup and doc.connect_my_computer_status. It turned out that this is not the best idea: we have to replace one document type with another in a few places and we already have a bug around it. Also, we don't really need two types of documents - we never display both of them at the same time.

Still, the distinction between setup and status is kept on the component level. However, to decide which one should be displayed, we can just check whether an agent has been configured (there is a config file on a disk).


I haven't renamed filenames (DocumentConnectMyComputerSetup.tsx -> Setup.tsx) because we have a few PRs opened that modify them and I don't want to cause unnecessary merge conflicts.

Copy link
Contributor

@avatus avatus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works fine for me!

@gzdunek gzdunek enabled auto-merge September 12, 2023 06:33
@gzdunek gzdunek added this pull request to the merge queue Sep 12, 2023
Merged via the queue into master with commit e062c79 Sep 12, 2023
@gzdunek gzdunek deleted the gzdunek/single-cmc-document branch September 12, 2023 06:59
@public-teleport-github-review-bot

@gzdunek See the table below for backport results.

Branch Result
branch/v14 Create PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants