Implement `deleteObjs` method in Circuit #1228

Tevetron · 2023-02-10T23:48:47Z

No description provided.

src/app/core/public/api/impl/Circuit.ts

src/app/core/internal/impl/CircuitInternal.ts

src/app/tests/DeleteObjects.test.ts

actually delete from the circuit as opposed to deleting from the given array

LeonMontealegre

Looking good!

Please make sure to update your branch though, there are some merge conflicts

LeonMontealegre · 2023-03-22T01:57:48Z

src/app/core/public/api/impl/BaseObject.ts

    protected get selections(): SelectionsManager {
        return this.state.selections;
    }

    public get kind(): string {
-        throw new Error("Unimplemented");
+        const tmp = this.circuit.getObjByID(this.objID);


nit: called this obj

LeonMontealegre · 2023-03-22T01:58:19Z

src/app/core/public/api/impl/BaseObject.ts

-        throw new Error("Unimplemented");
+        const tmp = this.circuit.getObjByID(this.objID);
+        if(!tmp)
+        {


nit: don't need brackets

LeonMontealegre · 2023-03-22T01:58:25Z

src/app/core/public/api/impl/BaseObject.ts

    public getProp(key: string): Prop {
-        throw new Error("Unimplemented");
+        const tmp = this.circuit.getObjByID(this.objID);


nit: call this obj

LeonMontealegre · 2023-03-22T01:58:43Z

src/app/core/public/api/impl/BaseObject.ts

-        throw new Error("Unimplemented");
+        const tmp = this.circuit.getObjByID(this.objID);
+        if(!tmp)
+        {


nit: don't need brackets

LeonMontealegre · 2023-03-22T01:58:51Z

src/app/core/public/api/impl/BaseObject.ts

    public getProps(): Record<string, Prop> {
-        throw new Error("Unimplemented");
+        const tmp = this.circuit.getObjByID(this.objID);


nit: call this obj

LeonMontealegre · 2023-03-22T02:05:33Z

src/app/tests/BaseObject.test.ts

+        const circuit = CreateCircuit();
+
+        const a = circuit.placeComponentAt(V(0, 0), "ANDGate");
+        expect(a.getProp('x')).toEqual(0);


nit: use " not '

LeonMontealegre · 2023-03-22T02:07:12Z

src/app/tests/BaseObject.test.ts

+        let cArray: Component[] = [a];
+        circuit.deleteObjs(cArray);


just do circuit.deleteObjs([a])

LeonMontealegre · 2023-03-22T02:08:16Z

src/app/tests/DeleteObjects.test.ts

+        let cArray: Component[] = [c];
+        circuit.deleteObjs(cArray);


just do circuit.deleteObjs([c])

src/app/tests/DeleteObjects.test.ts

LeonMontealegre · 2023-03-22T02:09:32Z

src/app/tests/DeleteObjects.test.ts

+        expect(s1.exists()).toEqual(false);
+        expect(s2.exists()).toEqual(false);
+        expect(l1.exists()).toEqual(false);
+    });


Also add some tests for when there are connections between components, and things like deleting a component that has connections and making sure the wires were deleted

LeonMontealegre · 2023-03-22T02:12:59Z

Also please update the title and description to provide some more useful information about the PR

…rcuits/OpenCircuits into model_refactor_api_friedj

LeonMontealegre · 2023-04-13T20:31:53Z

src/app/core/public/api/Port.ts

@@ -1,5 +1,6 @@
 import {BaseObject} from "./BaseObject";
 import {Component}  from "./Component";
+import {Wire}      from "./Wire";


nit: spacing

LeonMontealegre · 2023-04-13T20:32:53Z

src/app/core/public/api/impl/Circuit.ts

+    */
+    public deleteObjs(objs: Obj[]): void {
+        this.circuit.beginTransaction();
+        for(const obj of objs) {


nit: spacing

LeonMontealegre · 2023-04-13T20:32:57Z

src/app/core/public/api/impl/Circuit.ts

+        this.circuit.beginTransaction();
+        for(const obj of objs) 
+        {
+            if(obj.baseKind == "Port") { continue; }


LeonMontealegre · 2023-04-13T20:33:07Z

src/app/core/public/api/impl/Circuit.ts

+        this.circuit.beginTransaction();
+        for(const obj of objs) {
+            if(obj.baseKind == "Port") { continue; }
+            if(obj.baseKind == "Component") {


nit: spacing
nit: use ===

LeonMontealegre · 2023-04-13T20:33:14Z

src/app/core/public/api/impl/Circuit.ts

+            if(obj.baseKind == "Port") { continue; }
+            if(obj.baseKind == "Component") 
+            {
+                this.circuit.setPortConfig(obj.id, {});


LeonMontealegre · 2023-04-13T20:35:53Z

src/app/tests/DeleteObjects.test.ts

+        const circuit = CreateCircuit();
+
+        const c = circuit.placeComponentAt(V(0, 0), "ANDGate");
+


expect a.exists() to be true before deleting it

LeonMontealegre · 2023-04-13T20:36:13Z

src/app/tests/DeleteObjects.test.ts

+        const s1 = circuit.placeComponentAt(V(-5,  5), "Switch");
+        const s2 = circuit.placeComponentAt(V(-5, -5), "Switch");
+        const l1 = circuit.placeComponentAt(V(5,   0), "LED");
+


expect them to exist before deleting it as well

LeonMontealegre · 2023-04-13T20:37:05Z

src/app/tests/DeleteObjects.test.ts

+
+        const w1 = s1.ports["outputs"][0].connectTo(g.ports["inputs"][0]),
+        w2 = s2.ports["outputs"][0].connectTo(g.ports["inputs"][1]),
+        w3 =  g.ports["outputs"][0].connectTo(l.ports["inputs"][0]); 


don't comma separate, just declare const for each of them

LeonMontealegre · 2023-04-13T20:38:04Z

src/app/tests/DeleteObjects.test.ts

+        //TODO test for wires existing
+        //TODO ensure deletion working properly for full circuit
+        //none of my test cases are working properly right now unfortunately


Please do the TODOs or remove them

LeonMontealegre · 2023-04-13T20:38:59Z

src/app/tests/DeleteObjects.test.ts

+        //TODO test for wires existing
+        //TODO ensure deletion working properly for full circuit
+        //none of my test cases are working properly right now unfortunately
+    });


Add a test case for deleting just a wire, make sure the components and ports still exist
Add one for deleting just the ANDGate from the above circuit, and expect that the Switches and LED still exist while all the wires and the ANDGate were deleted

Tevetron added 2 commits February 10, 2023 17:03

Update Circuit.ts

ae8043f

testing

faf05ec

Tevetron changed the base branch from master to model_refactor_api February 10, 2023 23:50

LeonMontealegre added the Status: Awaiting Review label Feb 11, 2023

LeonMontealegre requested changes Feb 11, 2023

View reviewed changes

github-actions bot added Status: Changes Requested and removed Status: Awaiting Review labels Feb 11, 2023

Tevetron added 2 commits February 24, 2023 16:14

fix deleteObjs

aa05309

actually delete from the circuit as opposed to deleting from the given array

kind and setprop implemented

66cc43f

Tevetron requested a review from LeonMontealegre March 9, 2023 21:29

Tevetron added 4 commits March 17, 2023 17:09

Testing for deleting and api method implementation

cf9f865

BaseObject api testing

483af67

More Testing

6c36268

Update newPorts workaround

12f5a12

LeonMontealegre requested changes Mar 22, 2023

View reviewed changes

Tevetron and others added 6 commits March 24, 2023 16:17

Update DeleteObjects.test.ts

46e3c14

requested changes

726978c

Merge branch 'model_refactor_api' into model_refactor_api_friedj

c9ffb62

Merge branch 'model_refactor_api_friedj' of https://github.com/OpenCi…

96d7af5

…rcuits/OpenCircuits into model_refactor_api_friedj

Update BaseObject.ts

a41191d

Update DeleteObjects.test.ts

9a9fd8d

Tevetron changed the title ~~Model refactor api friedj~~ friedj BaseObject api methods Apr 7, 2023

Tevetron added 2 commits April 7, 2023 16:33

add wire return type for test cases

2431725

Update DeleteObjects.test.ts

ae54719

LeonMontealegre changed the title ~~friedj BaseObject api methods~~ Implement deleteObjs method in Circuit Apr 8, 2023

update deleteObjs and testCase

4a35971

Tevetron requested a review from LeonMontealegre April 11, 2023 20:06

github-actions bot added Status: Awaiting Review and removed Status: Changes Requested labels Apr 11, 2023

Update Circuit.ts

34de966

LeonMontealegre requested changes Apr 13, 2023

View reviewed changes

github-actions bot added Status: Changes Requested and removed Status: Awaiting Review labels Apr 13, 2023

LeonMontealegre closed this May 5, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement `deleteObjs` method in Circuit #1228

Implement `deleteObjs` method in Circuit #1228

Tevetron commented Feb 10, 2023 •

edited

LeonMontealegre left a comment

LeonMontealegre Mar 22, 2023

LeonMontealegre Mar 22, 2023

LeonMontealegre Mar 22, 2023

LeonMontealegre Mar 22, 2023

LeonMontealegre Mar 22, 2023

LeonMontealegre Mar 22, 2023

LeonMontealegre Mar 22, 2023

LeonMontealegre Mar 22, 2023

LeonMontealegre Mar 22, 2023

LeonMontealegre commented Mar 22, 2023

LeonMontealegre Apr 13, 2023

LeonMontealegre Apr 13, 2023

LeonMontealegre Apr 13, 2023

LeonMontealegre Apr 13, 2023

LeonMontealegre Apr 13, 2023

LeonMontealegre Apr 13, 2023

LeonMontealegre Apr 13, 2023

LeonMontealegre Apr 13, 2023

LeonMontealegre Apr 13, 2023

LeonMontealegre Apr 13, 2023

		const circuit = CreateCircuit();

		const c = circuit.placeComponentAt(V(0, 0), "ANDGate");

Implement deleteObjs method in Circuit #1228

Implement deleteObjs method in Circuit #1228

Conversation

Tevetron commented Feb 10, 2023 • edited

LeonMontealegre left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LeonMontealegre commented Mar 22, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Implement `deleteObjs` method in Circuit #1228

Implement `deleteObjs` method in Circuit #1228

Tevetron commented Feb 10, 2023 •

edited