## Description
This PR upgrades Prettier to v2 + enforces TypeScript’s [`import
type`](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html#type-only-imports-and-export)
syntax where applicable. It’s submitted as a separate PR so we can merge
it easily.
As a part of this PR, we reformat the codebase heavily:
- add `import type` everywhere where it’s required, and
- re-format the code to account for Prettier 2’s breaking changes:
https://prettier.io/blog/2020/03/21/2.0.0.html#breaking-changes
This PR is submitted against `release` to make sure all new code by team
members will adhere to new formatting standards, and we’ll have fewer
conflicts when merging `bundle-optimizations` into `release`. (I’ll
merge `release` back into `bundle-optimizations` once this PR is
merged.)
### Why is this needed?
This PR is needed because, for the Lodash optimization from
7cbb12af88,
we need to use `import type`. Otherwise, `babel-plugin-lodash` complains
that `LoDashStatic` is not a lodash function.
However, just using `import type` in the current codebase will give you
this:
<img width="962" alt="Screenshot 2023-03-08 at 17 45 59"
src="https://user-images.githubusercontent.com/2953267/223775744-407afa0c-e8b9-44a1-90f9-b879348da57f.png">
That’s because Prettier 1 can’t parse `import type` at all. To parse it,
we need to upgrade to Prettier 2.
### Why enforce `import type`?
Apart from just enabling `import type` support, this PR enforces
specifying `import type` everywhere it’s needed. (Developers will get
immediate TypeScript and ESLint errors when they forget to do so.)
I’m doing this because I believe `import type` improves DX and makes
refactorings easier.
Let’s say you had a few imports like below. Can you tell which of these
imports will increase the bundle size? (Tip: it’s not all of them!)
```ts
// app/client/src/workers/Linting/utils.ts
import { Position } from "codemirror";
import { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
It’s pretty hard, right?
What about now?
```ts
// app/client/src/workers/Linting/utils.ts
import type { Position } from "codemirror";
import type { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
Now, it’s clear that only `lodash` will be bundled.
This helps developers to see which imports are problematic, but it
_also_ helps with refactorings. Now, if you want to see where
`codemirror` is bundled, you can just grep for `import \{.*\} from
"codemirror"` – and you won’t get any type-only imports.
This also helps (some) bundlers. Upon transpiling, TypeScript erases
type-only imports completely. In some environment (not ours), this makes
the bundle smaller, as the bundler doesn’t need to bundle type-only
imports anymore.
## Type of change
- Chore (housekeeping or task changes that don't impact user perception)
## How Has This Been Tested?
This was tested to not break the build.
### Test Plan
> Add Testsmith test cases links that relate to this PR
### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
## Checklist:
### Dev activity
- [x] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag
### QA activity:
- [ ] Test plan has been approved by relevant developers
- [ ] Test plan has been peer reviewed by QA
- [ ] Cypress test cases have been added and approved by either SDET or
manual QA
- [ ] Organized project review call with relevant stakeholders after
Round 1/2 of QA
- [ ] Added Test Plan Approved label after reveiwing all Cypress test
---------
Co-authored-by: Satish Gandham <hello@satishgandham.com>
Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
248 lines
8.6 KiB
TypeScript
248 lines
8.6 KiB
TypeScript
import { ObjectsRegistry } from "../Objects/Registry";
|
|
const GITHUB_API_BASE = "https://api.github.com";
|
|
//const GITEA_API_BASE = "http://35.154.225.218";
|
|
|
|
import datasourceFormData from "../../fixtures/datasources.json";
|
|
|
|
export class GitSync {
|
|
public agHelper = ObjectsRegistry.AggregateHelper;
|
|
public locator = ObjectsRegistry.CommonLocators;
|
|
|
|
private _connectGitBottomBar = ".t--connect-git-bottom-bar";
|
|
private _gitSyncModal = ".git-sync-modal";
|
|
private _closeGitSyncModal = ".t--close-git-sync-modal";
|
|
private _gitRepoInput = ".t--git-repo-input";
|
|
private _useDefaultConfig =
|
|
"//span[text()='Use default configuration']/parent::div";
|
|
private _gitConfigNameInput = ".t--git-config-name-input";
|
|
private _gitConfigEmailInput = ".t--git-config-email-input";
|
|
_branchButton = "[data-testid=t--branch-button-container]";
|
|
private _branchSearchInput = ".t--branch-search-input";
|
|
private _bottomBarCommit = ".t--bottom-bar-commit span[name='plus']";
|
|
_bottomBarPull = ".t--bottom-bar-pull span[name='down-arrow-2']";
|
|
private _branchName = (branch: string) =>
|
|
"//div[contains(@class, 't--branch-button')]//*[text()='" + branch + "']";
|
|
_checkMergeability = "//span[contains(text(), 'Checking mergeability')]";
|
|
|
|
OpenGitSyncModal() {
|
|
this.agHelper.GetNClick(this._connectGitBottomBar);
|
|
this.agHelper.AssertElementVisible(this._gitSyncModal);
|
|
}
|
|
|
|
CloseGitSyncModal() {
|
|
this.agHelper.GetNClick(this._closeGitSyncModal);
|
|
this.agHelper.AssertElementAbsence(this._gitSyncModal);
|
|
}
|
|
|
|
CreateNConnectToGit(
|
|
repoName = "Test",
|
|
assertConnect = true,
|
|
privateFlag = false,
|
|
) {
|
|
this.agHelper.GenerateUUID();
|
|
cy.get("@guid").then((uid) => {
|
|
repoName += uid;
|
|
this.CreateTestGiteaRepo(repoName, privateFlag);
|
|
//this.CreateLocalGithubRepo(repoName);
|
|
this.AuthorizeKeyToGitea(repoName, assertConnect);
|
|
// cy.get("@remoteUrl").then((remoteUrl: any) => {
|
|
// this.AuthorizeLocalGitSSH(remoteUrl);
|
|
// });
|
|
cy.wrap(repoName).as("gitRepoName");
|
|
});
|
|
}
|
|
|
|
public CreateTestGiteaRepo(repo: string, privateFlag = false) {
|
|
cy.request({
|
|
method: "POST",
|
|
url: `${datasourceFormData["GITEA_API_BASE_TED"]}:${datasourceFormData["GITEA_API_PORT_TED"]}/api/v1/org/Cypress/repos`,
|
|
headers: {
|
|
Authorization: `token ${Cypress.env("GITEA_TOKEN")}`,
|
|
},
|
|
body: {
|
|
name: repo,
|
|
private: privateFlag,
|
|
},
|
|
});
|
|
}
|
|
|
|
public AuthorizeKeyToGitea(repo: string, assertConnect = true) {
|
|
let generatedKey;
|
|
this.OpenGitSyncModal();
|
|
cy.intercept("POST", "/api/v1/applications/ssh-keypair/*").as(
|
|
`generateKey-${repo}`,
|
|
);
|
|
|
|
this.agHelper.AssertAttribute(
|
|
this._gitRepoInput,
|
|
"placeholder",
|
|
"git@example.com:user/repository.git",
|
|
);
|
|
this.agHelper.TypeText(
|
|
this._gitRepoInput,
|
|
`${datasourceFormData["GITEA_API_URL_TED"]}/${repo}.git`,
|
|
//`git@github.com:${owner}/${repo}.git`,
|
|
);
|
|
|
|
this.agHelper.ClickButton("Generate key");
|
|
|
|
cy.wait(`@generateKey-${repo}`).then((result: any) => {
|
|
generatedKey = result.response.body.data.publicKey;
|
|
generatedKey = generatedKey.slice(0, generatedKey.length - 1);
|
|
// fetch the generated key and post to the github repo
|
|
cy.request({
|
|
method: "POST",
|
|
url: `${datasourceFormData["GITEA_API_BASE_TED"]}:${datasourceFormData["GITEA_API_PORT_TED"]}/api/v1/repos/Cypress/${repo}/keys`,
|
|
headers: {
|
|
Authorization: `token ${Cypress.env("GITEA_TOKEN")}`,
|
|
},
|
|
body: {
|
|
title: "key0",
|
|
key: generatedKey,
|
|
read_only: false,
|
|
},
|
|
});
|
|
|
|
this.agHelper.GetNClick(this._useDefaultConfig); //Uncheck the Use default configuration
|
|
this.agHelper.TypeText(
|
|
this._gitConfigNameInput,
|
|
"testusername",
|
|
//`{selectall}${testUsername}`,
|
|
);
|
|
this.agHelper.TypeText(this._gitConfigEmailInput, "test@test.com");
|
|
this.agHelper.ClickButton("CONNECT");
|
|
if (assertConnect) {
|
|
this.agHelper.ValidateNetworkStatus("@connectGitLocalRepo");
|
|
this.agHelper.AssertElementExist(this._bottomBarCommit, 0, 30000);
|
|
this.CloseGitSyncModal();
|
|
}
|
|
});
|
|
}
|
|
|
|
DeleteTestGithubRepo(repo: any) {
|
|
cy.request({
|
|
method: "DELETE",
|
|
url: `${datasourceFormData["GITEA_API_BASE_TED"]}:${datasourceFormData["GITEA_API_PORT_TED"]}/api/v1/repos/Cypress/${repo}`,
|
|
headers: {
|
|
Authorization: `token ${Cypress.env("GITEA_TOKEN")}`,
|
|
},
|
|
});
|
|
}
|
|
|
|
CreateGitBranch(branch = "Test", toUseNewGuid = false) {
|
|
if (toUseNewGuid) this.agHelper.GenerateUUID();
|
|
this.agHelper.AssertElementExist(this._bottomBarCommit);
|
|
this.agHelper.GetNClick(this._branchButton);
|
|
this.agHelper.Sleep(2000); //branch pop up to open
|
|
cy.get("@guid").then((uid) => {
|
|
//using the same uid as generated during CreateNConnectToGit
|
|
this.agHelper.TypeText(
|
|
this._branchSearchInput,
|
|
`{selectall}` + `${branch + uid}` + `{enter}`,
|
|
0,
|
|
true,
|
|
);
|
|
this.agHelper.AssertElementExist(this.locator._runBtnSpinner);
|
|
this.agHelper.AssertElementAbsence(this.locator._runBtnSpinner, 70000); //Since page taking more time to laod in some cases
|
|
this.agHelper.AssertElementVisible(this._branchName(branch + uid));
|
|
cy.wrap(branch + uid).as("gitbranchName");
|
|
});
|
|
}
|
|
|
|
//#region Unused methods
|
|
|
|
private AuthorizeLocalGitSSH(remoteUrl: string, assertConnect = true) {
|
|
let generatedKey;
|
|
this.OpenGitSyncModal();
|
|
this.agHelper.AssertAttribute(
|
|
this._gitRepoInput,
|
|
"placeholder",
|
|
"git@example.com:user/repository.git",
|
|
);
|
|
this.agHelper.TypeText(this._gitRepoInput, remoteUrl);
|
|
|
|
this.agHelper.ClickButton("Generate key");
|
|
|
|
cy.wait(`@generateKey`).then((result: any) => {
|
|
generatedKey = result.response.body.data.publicKey;
|
|
generatedKey = generatedKey.slice(0, generatedKey.length - 1);
|
|
var formdata = new FormData();
|
|
cy.log("generatedKey is " + generatedKey);
|
|
formdata.set("sshkey", generatedKey);
|
|
// fetch the generated key and post to the github repo
|
|
cy.request({
|
|
method: "POST",
|
|
url: `http://${datasourceFormData["GITEA_API_BASE_TED"]}:${datasourceFormData["GITEA_API_PORT_TED"]}/v1/gitserver/addgitssh`,
|
|
//body: formdata,
|
|
body: {
|
|
sshkey: generatedKey,
|
|
},
|
|
form: true,
|
|
// headers: {
|
|
// "Content-Type": "application/x-www-form-urlencoded"
|
|
// },
|
|
}).then((response) => {
|
|
expect(response.status).to.equal(200);
|
|
});
|
|
this.agHelper.GetNClick(this._useDefaultConfig); //Uncheck the Use default configuration
|
|
this.agHelper.TypeText(
|
|
this._gitConfigNameInput,
|
|
"testusername",
|
|
//`{selectall}${testUsername}`,
|
|
);
|
|
this.agHelper.TypeText(this._gitConfigEmailInput, "test@test.com");
|
|
this.agHelper.ClickButton("CONNECT");
|
|
|
|
if (assertConnect) {
|
|
//this.ReplaceForGit("cypress/fixtures/Bugs/GitConnectResponse.json", remoteUrl);
|
|
//cy.get('@connectGitLocalRepo').its('response.statusCode').should('equal', 200);
|
|
// cy.intercept("POST", "/api/v1/git/connect/app/*", {
|
|
// fixture: "/Bugs/GitConnectResponse.json",
|
|
// });
|
|
this.agHelper.ValidateNetworkStatus("@connectGitLocalRepo");
|
|
}
|
|
this.CloseGitSyncModal();
|
|
});
|
|
}
|
|
|
|
private ReplaceForGit(fixtureFile: any, remoteUrl: string) {
|
|
let currentAppId, currentURL;
|
|
cy.readFile(
|
|
fixtureFile,
|
|
// (err: string) => {
|
|
// if (err) {
|
|
// return console.error(err);
|
|
// }}
|
|
).then((data) => {
|
|
cy.url().then((url) => {
|
|
currentURL = url;
|
|
const myRegexp = /page-1(.*)/;
|
|
const match = myRegexp.exec(currentURL);
|
|
cy.log(currentURL + "currentURL from intercept is");
|
|
currentAppId = match ? match[1].split("/")[1] : null;
|
|
data.data.id = currentAppId;
|
|
data.data.gitApplicationMetadata.defaultApplicationId = currentAppId;
|
|
data.data.gitApplicationMetadata.remoteUrl = remoteUrl;
|
|
cy.writeFile(fixtureFile, JSON.stringify(data));
|
|
});
|
|
});
|
|
}
|
|
|
|
private CreateLocalGithubRepo(repo: string) {
|
|
let remoteUrl: string = "";
|
|
cy.request({
|
|
method: "GET",
|
|
url:
|
|
`http://${datasourceFormData["GITEA_API_BASE_TED"]}:${datasourceFormData["GITEA_API_PORT_TED"]}/v1/gitserver/addrepo?reponame=` +
|
|
repo,
|
|
}).then((response) => {
|
|
remoteUrl = JSON.stringify(response.body).replace(/['"]+/g, "");
|
|
expect(response.status).to.equal(200);
|
|
//cy.log("remoteUrl is"+ remoteUrl);
|
|
cy.wrap(remoteUrl).as("remoteUrl");
|
|
});
|
|
}
|
|
|
|
//#endregion
|
|
}
|