T2869 - coordinates field in Sealious

Open-source projects Sealious
1

@ziomek good job! Added some minor comments to D1388

1 Like
2

here is a diff after fixes: D1388

I’m not sure if everything is ok, cuz this diff shows only changes from last commit, but there were a commits before with changes from the task and fix after cr.

3

In the diff history view, you can see that the base of the diff has changed over time:

image
image1495×558 77.1 KB

The view of the diff displays the difference between the commit that you’re submitting for review, and the commit that is the merge target, so in this case the tip of the master branch.

It seems that the merge target is different now - it points to a commit not found in the remote repository. Try running the diff with

git fetch && arc diff --update D1388 origin/master
4

after running this command Login
I havew linter errors in some files, like in src/chip-types/fieldset.ts

image
image1533×938 105 KB

I guess value is type of promise but Im not sure what kind of value

promises.push(
				this.fields[field_name as string]
					.encode(
						context,
						to_encode,
						original_body[field_name as keyof FieldsetInput<Fields>]
					)
					.then((value) => {
						new_encoded[field_name as keyof typeof new_encoded] =
							value;
					})
			);

there is alsso such and other kind of errors in src/data-structures/long-running-process.ts

I think we should set some rules for the linter and for coding, cuz now there is plenty of linter errors all over the project

5

Argh, sorry, I keep fogetting that Sealious is one repository where we use dev as the default branch, not master. I’m making a note to change that, because it trips me every time.

Please run

git fetch && arc diff --update D1388 origin/dev

Apologies for my mistake.

6

yes I was about to ask now I remember why I changed target HEAD :smiley:

1 Like
7

fix D1388

1 Like
9

well this is output of ‘arc land’ used in sealious. I don’t understand this

ziomek@ziomek-HP:~/Documents/sealcode/sealious$ arc land
 STRATEGY  Merging with "squash" strategy, the default strategy.
 SOURCE  Landing the current branch, "arcpatch-D1388_3".
 ONTO REMOTE  Landing onto remote "origin", the default remote under Git.
 ONTO TARGET  Landing onto target "master", the default target under Git.
 INTO REMOTE  Will merge into remote "origin" by default, because this is the remote the change is landing onto.
 INTO TARGET  Will merge into target "master" by default, because this is the "onto" target.
 FETCH  Fetching "master" from remote "origin"...

  $   git fetch --no-tags --quiet -- origin master


 INTO COMMIT  Preparing merge into "master" from remote "origin", at commit "c1f3e705a65a".

 <!> LARGE WORKING SET 
There are 116 commit(s) reachable from the specified sources
("arcpatch-D1388_3") that are not present in the repository state you are
merging into ("c1f3e705a65a"). All of these commits will land:

  63a190ffcff9 Url field added
  092bd16e39c1 Add fix for fields being null all of a sudden
  d3ff266c8bc1 0.17.4
  606f381fa0e2 0.17.5
  7ca27caf0b38 Add option to filter text fields by multiple values
  < ... 106 more commits ... >
  1c11afc70be4 Fix formatting in README
  84baba9e74bb Added Markdown Field to sealious
  66302bca9eae Support exporting collection to CSV string
  e62c626f616e add Coordinates field type
  3863156569bd Merge remote-tracking branch 'origin/dev' into arcpatch-D1388_3

 >>>  Land 116 commit(s)? [y/N/?]
10

Yeah, another wrinkle caused by sealious using dev instead of master. Try

arc land --onto dev
11

thank you, landed

1 Like